remove PBXT

.bzrignore

@@ -311,7 +311,6 @@ libmysqld/ha_ndbcluster.cc
 libmysqld/ha_ndbcluster_binlog.cc
 libmysqld/ha_ndbcluster_cond.cc
 libmysqld/ha_partition.cc
-libmysqld/ha_pbxt.cc
 libmysqld/ha_tina.cc
 libmysqld/handler.cc
 libmysqld/handlerton.cc
@@ -457,7 +456,6 @@ libmysqld/tztime.cc
 libmysqld/uniques.cc
 libmysqld/unireg.cc
 libmysqld/discover_xt.cc
-libmysqld/ha_pbxt.cc
 libmysqld/myxt_xt.cc
 libmysqld/rpl_reporting.cc
 libmysqld/rpl_utility.cc
@@ -930,7 +928,6 @@ storage/ndb/tools/ndb_select_count
 storage/ndb/tools/ndb_show_tables
 storage/ndb/tools/ndb_test_platform
 storage/ndb/tools/ndb_waiter
-storage/pbxt/bin/xtstat
 storage/xtradb/configure.lineno
 storage/xtradb/conftest.s1
 storage/xtradb/conftest.subs
@@ -1115,7 +1112,6 @@ client/rpl_filter.h
 client/sql_list.cc
 client/sql_list.h
 libmysqld/create_options.cc
-storage/pbxt/bin/xtstat
 libmysqld/sql_expression_cache.cc
 mysql-test/mtr_command
 scripts/convert-debug-for-diff

debian/mariadb-test-5.5.dirs

@@ -67,9 +67,6 @@ usr/share/mysql/mysql-test/suite/ndb_team
 usr/share/mysql/mysql-test/suite/ndb_team/t
 usr/share/mysql/mysql-test/suite/ndb_team/r
 usr/share/mysql/mysql-test/suite/federated
-usr/share/mysql/mysql-test/suite/pbxt
-usr/share/mysql/mysql-test/suite/pbxt/t
-usr/share/mysql/mysql-test/suite/pbxt/r
 usr/share/mysql/mysql-test/suite/funcs_1
 usr/share/mysql/mysql-test/suite/funcs_1/cursors
 usr/share/mysql/mysql-test/suite/funcs_1/bitdata

mysql-test/include/have_pbxt.opt

---loose-pbxt

mysql-test/r/information_schema.result

@@ -43,7 +43,7 @@ create view v1 (c) as
 SELECT table_name FROM information_schema.TABLES
 WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND
 table_name not like 'ndb_%' AND table_name not like 'innodb_%' AND
-table_name not like 'pbxt_%' AND table_name not like 'xtradb_%';
+table_name not like 'xtradb_%';
 select * from v1;
 c
 CHARACTER_SETS

mysql-test/std_data/pbxt_load_unique_error1.inc

-1,abc
-2,def
-3,ghi
-3,jkl
-4,opq

mysql-test/suite/engines/rr_trx/include/check_repeatable_read_all_columns.inc

@@ -104,8 +104,6 @@ if (`SELECT IF($query_count > 1, 1, 0)`)
         # Detect extra rows:
         # Allow phantoms in some configurations:
         #   - InnoDB default settings
-        #   - Falcon's falcon_consistent_read=0 (non-default setting)
-        #   (TODO: What about PBXT?)
         #
         ###########################
         # TODO: Execute a query against tmp1 and tmp2 which selects new rows (rows

mysql-test/suite/engines/rr_trx/include/rr_init.test

@@ -13,14 +13,6 @@ if (`SELECT @@storage_engine LIKE 'InnoDB' AND @@version LIKE '%6.%'`)
     --enable_query_log
 }
 
-if (`SELECT @@storage_engine LIKE 'PBXT' AND @@version LIKE '%5.1%'`)
-{
-    --disable_query_log
-    SET SESSION binlog_format = 'MIXED';
-    SET GLOBAL binlog_format = 'MIXED';
-    --enable_query_log
-}
-
 # Verify default storage engine.
 SHOW VARIABLES LIKE 'storage_engine';
 

mysql-test/suite/funcs_1/r/is_columns_is_embedded.result

 SELECT * FROM information_schema.columns
 WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
-AND table_name not like 'pbxt_%'
 ORDER BY table_schema, table_name, column_name;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 def	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1		NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)				
@@ -422,7 +421,6 @@ COLLATION_NAME
 FROM information_schema.columns
 WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
-AND table_name not like 'pbxt_%'
 AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH = 1
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
@@ -435,7 +433,6 @@ COLLATION_NAME
 FROM information_schema.columns
 WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
-AND table_name not like 'pbxt_%'
 AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH <> 1
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
@@ -448,7 +445,6 @@ COLLATION_NAME
 FROM information_schema.columns
 WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
-AND table_name not like 'pbxt_%'
 AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH IS NULL
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
@@ -473,7 +469,6 @@ COLUMN_TYPE
 FROM information_schema.columns
 WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
-AND table_name not like 'pbxt_%'
 ORDER BY TABLE_SCHEMA, TABLE_NAME, ORDINAL_POSITION;
 COL_CML	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE
 3.0000	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	varchar	32	96	utf8	utf8_general_ci	varchar(32)

mysql-test/suite/funcs_1/r/is_tables_is.result

@@ -12,7 +12,7 @@ AS "user_comment",
 FROM information_schema.tables
 WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
-AND table_name not like 'pbxt_%' AND table_name not like 'xtradb_%'
+AND table_name not like 'xtradb_%'
 ORDER BY table_schema,table_name;
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
@@ -812,7 +812,7 @@ AS "user_comment",
 FROM information_schema.tables
 WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
-AND table_name not like 'pbxt_%' AND table_name not like 'xtradb_%'
+AND table_name not like 'xtradb_%'
 ORDER BY table_schema,table_name;
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema

mysql-test/suite/funcs_1/r/is_tables_is_embedded.result

@@ -12,7 +12,7 @@ AS "user_comment",
 FROM information_schema.tables
 WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
-AND table_name not like 'pbxt_%' AND table_name not like 'xtradb_%'
+AND table_name not like 'xtradb_%'
 ORDER BY table_schema,table_name;
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
@@ -812,7 +812,7 @@ AS "user_comment",
 FROM information_schema.tables
 WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
-AND table_name not like 'pbxt_%' AND table_name not like 'xtradb_%'
+AND table_name not like 'xtradb_%'
 ORDER BY table_schema,table_name;
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema

mysql-test/suite/funcs_1/t/is_columns_is_embedded.test

@@ -21,6 +21,5 @@ if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 }
 
 let $my_where = WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling' AND table_name not like 'innodb_%'
-AND table_name not like 'pbxt_%';
+AND table_name <> 'profiling' AND table_name not like 'innodb_%';
 --source suite/funcs_1/datadict/columns.inc

mysql-test/suite/funcs_1/t/is_tables_is.test

@@ -15,5 +15,5 @@
 --source include/not_embedded.inc
 let $my_where = WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
-AND table_name not like 'pbxt_%' AND table_name not like 'xtradb_%';
+AND table_name not like 'xtradb_%';
 --source suite/funcs_1/datadict/tables1.inc

mysql-test/suite/funcs_1/t/is_tables_is_embedded.test

@@ -19,5 +19,5 @@ if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 }
 let $my_where = WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%'
-AND table_name not like 'pbxt_%' AND table_name not like 'xtradb_%';
+AND table_name not like 'xtradb_%';
 --source suite/funcs_1/datadict/tables1.inc

mysql-test/t/information_schema.test

@@ -51,7 +51,7 @@ create view v1 (c) as
  SELECT table_name FROM information_schema.TABLES
   WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND
         table_name not like 'ndb_%' AND table_name not like 'innodb_%' AND
-        table_name not like 'pbxt_%' AND table_name not like 'xtradb_%';
+        table_name not like 'xtradb_%';
 --sorted_result
 select * from v1;
 

mysql-test/t/mysqld--help.test

@@ -26,7 +26,7 @@ perl;
   @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster
               feedback debug temp-pool ssl des-key-file
               xtradb thread-concurrency super-large-pages
-              mutex-deadlock-detector null-audit maria aria pbxt oqgraph
+              mutex-deadlock-detector null-audit maria aria oqgraph
               sphinx thread-handling thread-pool query-cache-info/;
 
   # And substitute the content some environment variables with their

scripts/make_win_bin_dist

@@ -158,11 +158,6 @@ for eng in $MARIA_BINARIES ; do
   cp storage/maria/$TARGET/$eng.{exe,pdb} $DESTDIR/bin
 done
 
-# PBXT
-if [ -f "storage/pbxt/bin/xtstat.exe" ] ; then
-  cp storage/pbxt/bin/xtstat.{exe,pdb} $DESTDIR/bin
-fi
-
 if [ x"$TARGET" != x"release" ] ; then
   cp client/$TARGET/mysql.pdb                            $DESTDIR/bin/
   cp client/$TARGET/mysqladmin.pdb                       $DESTDIR/bin/

scripts/mysql_install_db.sh

@@ -417,7 +417,7 @@ mysqld_install_cmd_line()
 {
   "$mysqld_bootstrap" $defaults "$mysqld_opt" --bootstrap \
   "--basedir=$basedir" "--datadir=$ldata" --log-warnings=0 --loose-skip-innodb \
-  --loose-skip-ndbcluster --loose-skip-pbxt $args --max_allowed_packet=8M \
+  --loose-skip-ndbcluster $args --max_allowed_packet=8M \
   --default-storage-engine=myisam \
   --net_buffer_length=16K
 }

sql-bench/server-cfg.sh

@@ -191,11 +191,6 @@ sub new
   {
     $self->{'transactions'}	= 1;	# Transactions enabled
   }
-  if (defined($main::opt_create_options) &&
-      $main::opt_create_options =~ /engine=pbxt/i)
-  {
-    $self->{'transactions'}	= 1;	# Transactions enabled
-  }
   if (defined($main::opt_create_options) &&
       $main::opt_create_options =~ /engine=ndb/i)
   {

sql/sql_plugin.cc

@@ -176,8 +176,7 @@ static struct
 
   /* we disable few other plugins by default */
   { "ndbcluster", PLUGIN_OFF },
-  { "feedback", PLUGIN_OFF },
-  { "pbxt", PLUGIN_OFF }
+  { "feedback", PLUGIN_OFF }
 };
 
 /* support for Services */

storage/pbxt/AUTHORS

-Paul McCullagh
-paul.mccullagh@primebase.org
-http://www.primebase.org
-http://pbxt.blogspot.com

storage/pbxt/CMakeLists.txt

-# Copyright (c) 2008 PrimeBase Technologies GmbH
-# 
-# PrimeBase XT
-# 
-# This program is free software; 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# 2006-03-22	Paul McCullagh
-#
-# H&G2JCtL
-#
-# This file is used to make the Windows version
-
-IF(NOT WITH_PBXT_STORAGE_ENGINE)
-  SET(WITHOUT_PBXT 1)
-ENDIF(NOT WITH_PBXT_STORAGE_ENGINE)
-
-
-SET(PBXT_SOURCES
-src/bsearch_xt.cc
-src/bsearch_xt.h
-src/cache_xt.cc
-src/cache_xt.h
-src/ccutils_xt.cc
-src/ccutils_xt.h
-src/database_xt.cc
-src/database_xt.h
-src/datadic_xt.cc
-src/datadic_xt.h
-src/datalog_xt.cc
-src/datalog_xt.h
-src/discover_xt.cc
-src/discover_xt.h
-src/filesys_xt.cc
-src/filesys_xt.h
-src/hashtab_xt.cc
-src/hashtab_xt.h
-src/ha_pbxt.cc
-src/ha_pbxt.h
-src/ha_xtsys.cc
-src/ha_xtsys.h
-src/heap_xt.cc
-src/heap_xt.h
-src/index_xt.cc
-src/index_xt.h
-src/linklist_xt.cc
-src/linklist_xt.h
-src/locklist_xt.cc
-src/locklist_xt.h
-src/lock_xt.cc
-src/lock_xt.h
-src/memory_xt.cc
-src/memory_xt.h
-src/myxt_xt.cc
-src/myxt_xt.h
-src/pbms.h
-src/pbms_enabled.cc
-src/pbms_enabled.h
-src/pthread_xt.cc
-src/pthread_xt.h
-src/restart_xt.cc
-src/restart_xt.h
-src/sortedlist_xt.cc
-src/sortedlist_xt.h
-src/strutil_xt.cc
-src/strutil_xt.h
-src/systab_xt.cc
-src/systab_xt.h
-src/tabcache_xt.cc
-src/tabcache_xt.h
-src/table_xt.cc
-src/table_xt.h
-src/thread_xt.cc
-src/thread_xt.h
-src/trace_xt.cc
-src/trace_xt.h
-src/util_xt.cc
-src/util_xt.h
-src/xaction_xt.cc
-src/xaction_xt.h
-src/xactlog_xt.cc
-src/xactlog_xt.h
-src/xt_config.h
-src/xt_defs.h
-src/xt_errno.h)
-
-MYSQL_ADD_PLUGIN(pbxt ${PBXT_SOURCES} STORAGE_ENGINE STATIC_ONLY)
-

storage/pbxt/INSTALL

-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   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 only 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.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  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=c89 CFLAGS=-O2 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 must use a version of `make' that
-supports the `VPATH' variable, such as 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 `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have 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).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/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.
-

storage/pbxt/README

-PrimeBase XT for MySQL 5.1
-==========================
-
-This is the PrimeBase XT (PBXT) transactional storage engine for MySQL. PBXT is "pluggable", which means that it can be loaded dynamically by MySQL at runtime. It uses a unique "write-once" update strategy and MVCC (multi-version concurrency control) to provide optimal performance over a wide range of tasks.
-
-This package includes the complete source code for the engine. Although this is a standalone project it must be built against a compiled version of the MySQL 5.1 source tree, because it references headers files used internally by the server.
-
-Details about how to build PBXT both under UNIX or Windows, as a standalone plug-in, or as part of the MySQL source code, is distribed in the documentation which is avaliable online at:
-
-http://www.primebase.org/documentation
-
-Bug reports, questions and comments can be sent directly to me.
-
-Thanks for your support!
-
-Paul McCullagh
-SNAP Innovation GmbH
-paul.mccullagh@primebase.org
-

storage/pbxt/TODO

-PBXT To-Do List
-===============
-
-My thanks to all who have downloaded and tested PBXT. If an issue you reported before the date below is not on this list, please e-mail me again. 
-
-------- 2008-12-09
-
-0063: The option for not using memory mapped files must be fixed.
-
-0062: Dynamic option for using memory mapping on a table (Dimitri).
-
-------- 2008-09-12
-
-0061: Add records per key result to ha_pbxt:info() call (Mark).
-
-------- 2008-08-31
-
-0060: Add table option to determine if a table should be memory mapped or not (also requested by Dimitri).
-
-0059: Add table options:
-  AVG_ROW_LENGTH [=] value
-  DATA DIRECTORY [=] 'absolute path to directory'
-  INDEX DIRECTORY [=] 'absolute path to directory'
-  MAX_ROWS [=] value
-
-------- 2008-03-28
-
-0058: Consolidate writes when changes in the log are applied to the database.
-
-------- 2008-03-07
-
-0057: Cluster updates onto a single page.
-
-0056: Add checksum to index and data pages.
-
-0055: When no index cache is available, the complete index must be flushed (not just single pages).
-
-0054: Optimize indexes by not creating indexes that are a complete sub-set of some other index. In this case we must be able to identify part of an index as unique. For example: primary key (a, b), index (a, b, c). Here we would just create index (a, b, c), and specify that the part (a, b) must be unique. Operations on (a, b) will be directed to index (a, b, c).
-
-0053: Check and test lock tables.
-
-0052: Cache data log data in the handle data cache. Must be purged when a handle data record is written.
-
-0051: Write data log data alternatively to the transaction log. The compactor must then compact transaction logs.
-
-0050: [RESOLVED: RN126] Implement consistent write for indexes.
-
-0049: [RESOLVED: RN114] Set the index block size to 4K, or 16K as used by InnoDB.
-
-0048: [RESOLVED: RN110] Add row ID to indexes. This should only be set once the row is cleaned by the sweeper. Then the row ID can be used to make a quite check if the row is the most recent version.
-
-------- 2007-06-19
-
-0047: Test build with ./configure --with-innodb under Linux (Vadim).
-
-0046: [RESOLVED: RN85] Add plug.in file to enable drop in compile under Linux.
-
-0045: Provide libstdc++.so.6 binaries (Vadim).
-
-0044: [RESOLVED: RN73] Limit number of file handles used per table (Brian).
-
-0043: XA (two-phase commit) support (Peter).
-
-------- 2007-03-13
-
-0042: [RESOLVED: RN108] Implemement STATUS commands.
-
-0041: Implement index prefix compression.
-
-------- 2007-03-07
-
-0040: [RESOLVED: RN60] Update in-place when a transaction updates the same record more than once.
-
-0039: Set the number and size of the segments dynamically according to the amount of memory in the cache (and the number of CPUs?) (as discussed with: Peter & Vadim).
-
-0038: [RESOLVED: RN133] Improve the efficiency of the locks by using atomic compare and swap (Peter & Vadim).
-
-0037: [RESOLVED: RN133] Instead of a global LRU list, use a LRU list for segment of the cache (Peter & Vadim). [ Note: a global list using a TAS lock and change time (so that LRU is not always updated) is most efficient].
-
-0036: Add support for deferred foreign key checking (requested by: Mark).
-
-0035: [RESOLVED: RN71] Remove the 2000 table limit (reported by: Hakan).
-
-------- 2007-02-28
-
-0035: [RESOLVED: RN74, RN107] Build in the PBXT system parameters (currently they must be set using environment variables.
-
-0034: [RESOLVED: RN117] Initial documentation (yes, it must be done!)
-
-0033: Make the error code returned on lock error configurable.
-
-0032: [RESOLVED: RN65] Create a source code pluggable version for Windows.
-
-0031: [RESOLVED: RN66] PBXT corrupts the index file when the size exceeds 4 GB (reported by: Luciano)
-
-0030: [RESOLVED: RN102] Implement pbxt_index_flush_delay. Postpones index writing in order to speed up imports. [Resolution uses that fact hat index entries that are missing are added during recovery. As a result, index flushing can be delayed.]
-
-0029: [RESOLVED: RN103] Implement SELECT ... FOR UPDATE (recommended by: Robin).
-
-------- 2007-02-14
-
-0028: Implement CREATE TABLE ... DATA/INDEX DIRECTORY (suggested by: Robin).
-
-------- 2006-12-06
-
-0027: [RESOLVED: RN53] Bug in pbxt with query caching (reported by: Giuseppe) caused violation of transaction isolation.
-
-------- 2006-08-05
-
-0026: Implement BACKUP and RESTORE table (planned for the first post release version).
-
-0025: Implement DISABLE/ENABLE KEYS. Works for FOREIGN KEYs, currently no plans to implement for disabling indexes.
-
-0024: Implement ANALYZE TABLE (planned for the first post release version).
-
-0023: Implement CHECK TABLE (planned for the first release candidate).
-
-0022: [RESOLVED: RN18] Implement TRUNCATE TABLE and DELETE FROM <table>; (i.e. a DELETE without WHERE clause). Currently this function does not cause an error, but no rows are deleted.
-
-------- 2006-07-06
-
-0021: [RESOLVED: RN28] .../mysql-test/mysql-test-run --force --mysqld=--default-storage-engine=pbxt produces a number of errors (reported by: Hakan): As far as I can tell some failures are unnessary but others are bugs. All need to be checked.
-
-------- 2006-07-03
-
-0020: [RESOLVED: RN49] Implement referential integrity (planned for the first release candidate).
-
-------- 2006-04-01
-
-0019: [RESOLVED: RN28] mysql-test-run hangs on alter table (reported by: Hakan): Running a test like ./mysql-test-run.pl --mysqld=--default-storage-engine=pbxt, hangs on ALTER TABLE.
-
-0018: Implement GEOMETRY date type. Note: There are currently no plans to implement this feature.
-
-------- 2006-03-31
-
-0017: [RESOLVED: RN37] MySQL 5.x Version (reported by: Ronald, Giuseppe).
-
-0016: [RESOLVED: RN13] Hang on "DROP DATABASE" (reported by: Giuseppe). Load the world database (http://downloads.mysql.com/docs/world.sql) and convert all tables into PBXT. Then, the drop database command hangs.
-
-0015: [RESOLVED: RN12] Implement isolation level "repeatable read" (reported by: Giuseppe). Current PBXT only supports isolation level "committed read". This means committed data can be seen no matter when it was committed. Use SELECT ... FOR UPDATE to guarantee repeatable read, on data already read.
-
-0014: [RESOLVED: RN7] Two transactions cannot insert simaltaneously if they use auto_increment (reported by: Giuseppe). See also 0005.
-
-0013: [RESOLVED: RN11] Implement buffered write (reported by: Giuseppe): Lack of buffered write leads to bad performance in operations such as ALTER TABLE ENGINE = PBXT and INSERT ... SELECT.
-
-0012: [RESOLVED: RN18] TRUNCATE does not work (reported by: Giuseppe)
-
-0011: [RESOLVED: RN2] Load Sakila Sample Database (reported by: Ronald): ALTER TABLE film ENGINE=PBXT; fails
-
-0010: [RESOLVED: RN6] sql-bench (reported by: Dmitry): ./run-all-tests --create-options=TYPE=PBXT fails.
-
-0009: [RESOLVED: RN29] 64-bit Linux (reported by: Hakan): PBXT current does not compile under 64-bit Linux.
-
-------- 2006-03-16 
-
-0008: [RESOLVED: RN10] Enforcing the unique index constraint:
-
-An index declared as "unique" must return a "duplicate unique key" error when inserting a duplicate value. The difficulty part of implementing this in PBXT is that we may encounter a duplicate value that has not yet been committed. The index reading thread must then wait for the transaction to commit or abort.
-
-0007: [RESOLVED: RN9] Cleaning up empty index nodes:
-
-The Lehman and Yoa algorithm used for indexing does not describe a way of cleaning up empty index nodes on-the-fly. A search of the relevant literature for an algorithm also turns up empty handed (periodic "reorg" is mostly suggested). I have subsequently devised an algorithm that will do the job. This needs to be implemented.
-
-0006: [RESOLVED: RN8] Cache Balancing:
-
-PBXT uses a number of small caches in order to improve concurrency (rather than one large cache). A process is required to manage the amount of cache memory used as a whole. The process must distribute the overall amount of memory available for caching over the small caches, according to demand.
-
-0005: [RESOLVED: RN7] Implement a faster auto-increment method
-
-Currently the auto-increment is handled by the default method used in MySQL. This is done by performing a "fetch-last" on the index for each insert to find the highest key value. This works well unless there are large number empty index nodes due to the problem described in (2) above.
-
-PBXT Testing To-Do List
-
-This is my first take on what still must be tested. My thanks to Ronald Bradford who is working on a generic testing framework that can be used to test PBXT.
-
-0004: [RESOLVED: RN6, RN28] MySQL Tests:
-
-Several tests (for mysql-test-run) written for other engines can be adapted and used to test PBXT.
-
-0003: [RESOLVED: RN30] Multi-processor Test:
-
-There is a difference between preemptive multitasking and true multitasking, which you have on a multi-processor (or dual core) machine. I don't expect any fundamental problems here, but it must be tested.
-
-0002: [RESOLVED: RN5, RN30, RN43] Multi-user/locking Test:
-
-How does the engine perform with a number of concurrent users running various transactions on a number of different tables?
-This is a difficult test to write because it need to simulate a production situation. To test at least 2 or 3 machines is required. The idea is not to use too much data so that a lot of conflicts may occur.
-
-0001: [RESOLVED: RN4, RN43] Load/Stability Test:
-
-How does the engine perform under heavy load over a long period of time? How stable is the engine on power outage, etc?
-
-The test could use a variation of the test program written for test (3) above. At least 3 test machines would be required. The test must be modified to cause as much activity as possible. The test should monitor the performance under load.
-
-

storage/pbxt/mysql-test/main/README

-There are two ways to make an overlay to test a new storage engine: inclusive
-and exclusive.
-
-In the inclusive approach one would create have_pbxt.inc, and the corresponding
-have_pbxt.opt. And for every test from the main suite that should run in the
-overlay, one would need a wrapper like
-
-=====[create.test]======
-source have_pbxt.inc;
-source create.test;
-drop database pbxt;
-========================
-
-The last line is needed, because pbxt creates 'pbxt' database automatically,
-and we need to remove it to pass the after-test check.
-
-In the exclusive approach, one would create my.cnf or suite.opt - this affects
-all tests, so mtr would run *all* tests of the main suite with the new options.
-And one would use disabled.def to selectively disable tests and
---init-file option to create the database pbxt before the before-test check
-(then we won't need to drop it at the end of the test).
-

storage/pbxt/mysql-test/main/disabled.def

-#
-# these tests are disabled to make main-pbxt overlay to pass.
-# this is just quick'n'dirty list. Many tests here could be fixed to pass.
-# many other should be disabled, because there's little sense to run them here
-# some are genuine bugs.
-#
-
-create_select_tmp: PBXT requires format=row
-ctype_cp932_binlog_stm: PBXT requires format=row
-multi_update: PBXT requires format=row
-mysqlbinlog-cp932: PBXT requires format=row
-mysqlbinlog2: PBXT requires format=row
-mysqlbinlog: PBXT requires format=row
-mysqldump: PBXT requires format=row
-mysqldump_restore: PBXT requires format=row
-mysqltest: PBXT requires format=row
-partition_binlog: PBXT requires format=row
-ps: PBXT requires format=row
-user_var-binlog: PBXT requires format=row
-
-mysqlbinlog_row: test expects a non-transactional engine
-
-pool_of_threads: unstable
-
-merge_recover: meaningless in overlay
-merge_debug: meaningless in overlay
-myisam: meaningless in overlay
-myisam_icp: meaningless in overlay
-myisampack: meaningless in overlay
-plugin_innodb: meaningless in overlay
-preload: meaningless in overlay
-query_cache_merge: meaningless in overlay
-status: meaningless in overlay
-variables: meaningless in overlay
-#... probably many more tests should be disabled, as meaningless in this overlay
-
-alter_table: PBXT does not support GEOMETRY
-gis-precise: PBXT does not support GEOMETRY
-gis-rtree: PBXT does not support GEOMETRY
-gis: PBXT does not support GEOMETRY
-loaddata: PBXT does not support GEOMETRY
-subselect_cache: PBXT does not support GEOMETRY
-subselect_gis: PBXT does not support GEOMETRY
-subselect_sj: PBXT does not support GEOMETRY
-subselect_sj_jcl6: PBXT does not support GEOMETRY
-ctype_big5: PBXT does not support FULLTEXT
-ctype_binary: PBXT does not support FULLTEXT
-ctype_cp1251: PBXT does not support FULLTEXT
-ctype_latin1: PBXT does not support FULLTEXT
-ctype_latin1_de: PBXT does not support FULLTEXT
-ctype_ldml: PBXT does not support FULLTEXT
-ctype_ucs: PBXT does not support FULLTEXT
-fulltext2: PBXT does not support FULLTEXT
-fulltext3: PBXT does not support FULLTEXT
-fulltext: PBXT does not support FULLTEXT
-fulltext_cache: PBXT does not support FULLTEXT
-fulltext_left_join: PBXT does not support FULLTEXT
-fulltext_multi: PBXT does not support FULLTEXT
-fulltext_order_by: PBXT does not support FULLTEXT
-fulltext_update: PBXT does not support FULLTEXT
-fulltext_var: PBXT does not support FULLTEXT
-gcc296: PBXT does not support FULLTEXT
-key_cache: PBXT does not support FULLTEXT
-query_cache: PBXT does not support FULLTEXT
-select: PBXT does not support FULLTEXT
-select_jcl6: PBXT does not support FULLTEXT
-select_pkeycache: PBXT does not support FULLTEXT
-subselect: PBXT does not support FULLTEXT
-subselect_no_mat: PBXT does not support FULLTEXT
-subselect_no_opts: PBXT does not support FULLTEXT
-subselect_no_scache: PBXT does not support FULLTEXT
-subselect_no_semijoin: PBXT does not support FULLTEXT
-view: PBXT does not support FULLTEXT
-
-sp-lock: PBXT does not support savepoints
-#
-# Tests below are either genuine bugs
-# or need some minor tweaks like --sorted_results somewhere in the test file.
-#
-alter_table_online: ???
-analyze: ???
-auto_increment: ???
-compress: ???
-ctype_collate: ???
-ctype_many: ???
-ctype_uca: ???
-ctype_ucs2_def: ???
-ctype_ujis_ucs2: ???
-ctype_utf16: ???
-ctype_utf16_def: ???
-ctype_utf16_uca: ???
-ctype_utf32: ???
-delete: ???
-drop-no_root: ???
-error_simulation: ???
-events_bugs: ???
-explain: ???
-flush: ???
-foreign_key: ???
-func_gconcat: ???
-having: ???
-insert: ???
-insert_notembedded: ???
-insert_update: ???
-join_cache: ???
-join_nested_jcl6: ???
-key: ???
-kill: ???
-limit: ???
-lock: ???
-lock_multi: ???
-log_tables_upgrade: ???
-metadata: ???
-mrr_icp_extra: ???
-multi_statement: ???
-multi_update_tiny_hash: ???
-myisam_mrr: ???
-mysqlcheck: ???
-mysql_upgrade: ???
-mysql_upgrade_ssl: ???
-negation_elimination: ???
-order_by: ???
-outfile: ???
-partition_key_cache: ???
-partition_list: ???
-partition_mgm: ???
-partition_range: ???
-partition_rename_longfilename: ???
-profiling: ???
-ps_10nestset: ???
-query_cache_debug: ???
-query_cache_notembedded: ???
-range_mrr_icp: ???
-range_vs_index_merge: ???
-read_only: ???
-repair: ???
-replace: ???
-row: ???
-select_safe: ???
-sp: ???
-sp_notembedded: ???
-ssl: ???
-ssl_compress: ???
-subselect3_jcl6: ???
-subselect4: ???
-subselect_mat_cost: ???
-subselect_sj2_jcl6: ???
-symlink: ???
-trigger: ???
-trigger_notembedded: ???
-truncate_coverage: ???
-type_blob: ???
-type_newdecimal: ???
-type_timestamp: ???
-union: ???
-range: ???
-upgrade: ???
-update: ???
-view_grant: ???
-warnings: ???
-

storage/pbxt/mysql-test/main/init_file.sql

-#
-# Normally, PBXT creates pbxt database automatically, on the first use.
-# but if we let it to do so in mysql-test, then the after-test check
-# will complain that the test did not restore the enviroment properly
-# (did not delete 'pbxt' database, that was created during the test).
-# One solution would be to patch all test files and add "drop database"
-# at the end,
-# Another one - use --init-file to create the database *before* the
-# before-test check.
-#
-create database pbxt;

storage/pbxt/mysql-test/main/r/1st.rdiff

---- r/1st.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/1st.reject	2012-02-10 15:02:56.000000000 +0100
-@@ -3,6 +3,7 @@
- information_schema
- mtr
- mysql
-+pbxt
- performance_schema
- test
- show tables in mysql;

storage/pbxt/mysql-test/main/r/ansi.rdiff

---- r/ansi.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/ansi.reject	2012-02-10 15:07:15.000000000 +0100
-@@ -23,26 +23,26 @@
- t1	CREATE TABLE `t1` (
-   `i` int(11) NOT NULL AUTO_INCREMENT,
-   PRIMARY KEY (`i`)
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- SET @@SQL_MODE="MYSQL323";
- SHOW CREATE TABLE t1;
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `i` int(11) NOT NULL AUTO_INCREMENT,
-   PRIMARY KEY (`i`)
--) TYPE=MyISAM
-+) TYPE=PBXT
- SET @@SQL_MODE="MYSQL40";
- SHOW CREATE TABLE t1;
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `i` int(11) NOT NULL AUTO_INCREMENT,
-   PRIMARY KEY (`i`)
--) TYPE=MyISAM
-+) TYPE=PBXT
- SET @@SQL_MODE="NO_FIELD_OPTIONS";
- SHOW CREATE TABLE t1;
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `i` int(11) NOT NULL,
-   PRIMARY KEY (`i`)
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- DROP TABLE t1;

storage/pbxt/mysql-test/main/r/bench_count_distinct.rdiff

---- r/bench_count_distinct.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/bench_count_distinct.reject	2012-02-10 15:08:20.000000000 +0100
-@@ -5,7 +5,7 @@
- 100
- explain extended select count(distinct n) from t1;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
--1	SIMPLE	t1	range	NULL	n	4	NULL	10	100.00	Using index for group-by
-+1	SIMPLE	t1	range	NULL	n	4	NULL	201	99.50	Using index for group-by (scanning)
- Warnings:
- Note	1003	select count(distinct `test`.`t1`.`n`) AS `count(distinct n)` from `test`.`t1`
- drop table t1;

storage/pbxt/mysql-test/main/r/bigint.rdiff

---- r/bigint.result	2011-10-21 23:35:26.000000000 +0200
-+++ r/bigint.reject	2012-02-10 15:08:57.000000000 +0100
-@@ -181,14 +181,14 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` int(1) NOT NULL DEFAULT '0'
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- create table t1 select 9223372036854775809 as 'a';
- show create table t1;
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` bigint(19) unsigned NOT NULL DEFAULT '0'
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- select * from t1;
- a
- 9223372036854775809

storage/pbxt/mysql-test/main/r/binary.rdiff

---- r/binary.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/binary.reject	2012-02-10 15:09:29.000000000 +0100
-@@ -139,7 +139,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` binary(1) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- create table t1 (col1 binary(4));
- insert into t1 values ('a'),('a ');

storage/pbxt/mysql-test/main/r/case.rdiff

---- r/case.result	2011-11-22 18:50:25.000000000 +0100
-+++ r/case.reject	2012-02-10 15:12:23.000000000 +0100
-@@ -111,7 +111,7 @@
-   `c10` double NOT NULL DEFAULT '0',
-   `c11` double NOT NULL DEFAULT '0',
-   `c12` varchar(5) NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- DROP TABLE t1;
- SELECT CASE 
- WHEN 1 
-@@ -158,7 +158,7 @@
-   `COALESCE(1,'1')` varchar(1) NOT NULL DEFAULT '',
-   `COALESCE(1.1,'1')` varchar(4) NOT NULL DEFAULT '',
-   `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- DROP TABLE t1;
- CREATE TABLE t1 SELECT IFNULL('a' COLLATE latin1_swedish_ci, 'b' COLLATE latin1_bin);
- ERROR HY000: Illegal mix of collations (latin1_swedish_ci,EXPLICIT) and (latin1_bin,EXPLICIT) for operation 'ifnull'

storage/pbxt/mysql-test/main/r/cast.rdiff

---- r/cast.result	2012-01-11 21:08:05.000000000 +0100
-+++ r/cast.reject	2012-02-10 15:13:13.000000000 +0100
-@@ -404,7 +404,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `t` varchar(4) CHARACTER SET cp1251 NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- select
- cast(_latin1'ab'  AS char)    as c1,
-@@ -442,7 +442,7 @@
-   `c3` varbinary(2) NOT NULL DEFAULT '',
-   `c4` varbinary(2) NOT NULL DEFAULT '',
-   `c5` varbinary(2) NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- select
- cast(_koi8r''  AS nchar)    as c1,
-@@ -475,7 +475,7 @@
-   `c3` varchar(2) CHARACTER SET utf8 NOT NULL DEFAULT '',
-   `c4` varchar(2) CHARACTER SET utf8 NOT NULL DEFAULT '',
-   `c5` varchar(2) CHARACTER SET utf8 NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- create table t1 (a binary(4), b char(4) character set koi8r);
- insert into t1 values (_binary'',_binary'');
-@@ -590,7 +590,7 @@
-   `cast("2001-1-1" as DATE)` date DEFAULT NULL,
-   `cast("2001-1-1" as DATETIME)` datetime DEFAULT NULL,
-   `cast("1:2:3" as TIME)` time DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- CREATE TABLE t1 (f1 double);
- INSERT INTO t1 SET f1 = -1.0e+30 ;

storage/pbxt/mysql-test/main/r/check.rdiff

---- r/check.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/check.reject	2012-02-10 15:13:37.000000000 +0100
-@@ -21,6 +21,7 @@
- test.t1	check	status	OK
- REPAIR TABLE t1;
- Table	Op	Msg_type	Msg_text
-+test.t1	repair	note	Table does not support optimize, doing recreate + analyze instead
- test.t1	repair	status	OK
- DROP TABLE t1;
- #

storage/pbxt/mysql-test/main/r/constraints.rdiff

---- r/constraints.result	2011-12-13 12:00:39.000000000 +0100
-+++ r/constraints.reject	2012-02-10 15:16:24.000000000 +0100
-@@ -25,7 +25,7 @@
-   UNIQUE KEY `constraint_1` (`a`),
-   UNIQUE KEY `key_1` (`a`),
-   UNIQUE KEY `key_2` (`a`)
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- drop table if exists t_illegal;
- create table t_illegal (a int, b int, check a>b);

storage/pbxt/mysql-test/main/r/create-uca.rdiff

---- r/create-uca.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/create-uca.reject	2012-02-10 15:20:48.000000000 +0100
-@@ -16,7 +16,7 @@
-   `c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
-   `c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b',
-   `c6` varchar(255) COLLATE latin1_bin DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin
-+) ENGINE=PBXT DEFAULT CHARSET=latin1 COLLATE=latin1_bin
- CREATE TABLE t2 AS SELECT * FROM t1;
- SHOW CREATE TABLE t2;
- Table	Create Table
-@@ -27,5 +27,5 @@
-   `c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
-   `c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b',
-   `c6` varchar(255) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- DROP TABLE t1,t2;

storage/pbxt/mysql-test/main/r/create_not_windows.rdiff

---- r/create_not_windows.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/create_not_windows.reject	2012-02-10 15:21:01.000000000 +0100
-@@ -10,7 +10,7 @@
-   `_id` int(11) NOT NULL AUTO_INCREMENT,
-   `about:text` varchar(255) NOT NULL DEFAULT '',
-   PRIMARY KEY (`_id`)
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table `about:text`;
- use test;
- drop table if exists t1;

storage/pbxt/mysql-test/main/r/ctype_cp1250_ch.rdiff

---- r/ctype_cp1250_ch.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/ctype_cp1250_ch.reject	2012-02-10 15:24:12.000000000 +0100
-@@ -84,7 +84,7 @@
- t1	CREATE TABLE `t1` (
-   `name` varchar(10) DEFAULT NULL,
-   `level` smallint(5) unsigned DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=cp1250
-+) ENGINE=PBXT DEFAULT CHARSET=cp1250
- insert into t1 values ('string',1);
- select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
- concat(name,space(level))	concat(name, repeat(' ',level))
-@@ -177,7 +177,7 @@
- t1	CREATE TABLE `t1` (
-   `name` varchar(10) COLLATE cp1250_czech_cs DEFAULT NULL,
-   `level` smallint(5) unsigned DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=cp1250 COLLATE=cp1250_czech_cs
-+) ENGINE=PBXT DEFAULT CHARSET=cp1250 COLLATE=cp1250_czech_cs
- insert into t1 values ('string',1);
- select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
- concat(name,space(level))	concat(name, repeat(' ',level))

storage/pbxt/mysql-test/main/r/ctype_cp932_binlog_row.rdiff

---- r/ctype_cp932_binlog_row.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/ctype_cp932_binlog_row.reject	2012-02-10 13:14:44.000000000 +0100
-@@ -12,7 +12,7 @@
- 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	#	Xid	#	#	COMMIT /* XID */
- SELECT HEX(f1) FROM t1;
- HEX(f1)
- 8300

storage/pbxt/mysql-test/main/r/ctype_create.rdiff

---- r/ctype_create.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/ctype_create.reject	2012-02-10 15:25:06.000000000 +0100
-@@ -13,7 +13,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` char(10) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin5
-+) ENGINE=PBXT DEFAULT CHARSET=latin5
- DROP TABLE mysqltest2.t1;
- ALTER DATABASE mysqltest2 DEFAULT CHARACTER SET latin7;
- CREATE TABLE mysqltest2.t1 (a char(10));
-@@ -21,7 +21,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` char(10) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin7
-+) ENGINE=PBXT DEFAULT CHARSET=latin7
- DROP DATABASE mysqltest2;
- CREATE DATABASE mysqltest2 CHARACTER SET latin2;
- CREATE TABLE mysqltest2.t1 (a char(10));
-@@ -29,7 +29,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` char(10) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin2
-+) ENGINE=PBXT DEFAULT CHARSET=latin2
- DROP DATABASE mysqltest2;
- USE mysqltest1;
- CREATE TABLE t1 (a char(10));
-@@ -37,14 +37,14 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` char(10) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=cp1251
-+) ENGINE=PBXT DEFAULT CHARSET=cp1251
- DROP TABLE t1;
- CREATE TABLE t1 (a char(10)) DEFAULT CHARACTER SET latin1;
- SHOW CREATE TABLE t1;
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` char(10) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- DROP TABLE t1;
- CREATE TABLE t1 (a char(10)) 
- DEFAULT CHARACTER SET latin1 COLLATE latin1_german1_ci;
-@@ -52,7 +52,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` char(10) COLLATE latin1_german1_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_german1_ci
-+) ENGINE=PBXT DEFAULT CHARSET=latin1 COLLATE=latin1_german1_ci
- DROP TABLE t1;
- create table t1 (a char) character set latin1 character set latin2;
- ERROR HY000: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET latin2'

storage/pbxt/mysql-test/main/r/ctype_eucjpms.rdiff

---- r/ctype_eucjpms.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/ctype_eucjpms.reject	2012-02-10 15:26:52.000000000 +0100
-@@ -9893,7 +9893,7 @@
- t1	CREATE TABLE `t1` (
-   `code` varchar(6) CHARACTER SET eucjpms NOT NULL DEFAULT '',
-   `a` varchar(1) CHARACTER SET eucjpms NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- UPDATE t1 SET a=unhex(code) ORDER BY code;
- Warnings:
- Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1

storage/pbxt/mysql-test/main/r/ctype_euckr.rdiff

---- r/ctype_euckr.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/ctype_euckr.reject	2012-02-10 15:26:59.000000000 +0100
-@@ -80,7 +80,7 @@
- t1	CREATE TABLE `t1` (
-   `name` varchar(10) DEFAULT NULL,
-   `level` smallint(5) unsigned DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=euckr
-+) ENGINE=PBXT DEFAULT CHARSET=euckr
- insert into t1 values ('string',1);
- select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
- concat(name,space(level))	concat(name, repeat(' ',level))
-@@ -24280,7 +24280,7 @@
- t1	CREATE TABLE `t1` (
-   `code` varchar(8) DEFAULT NULL,
-   `a` varchar(1) CHARACTER SET euckr NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- UPDATE t1 SET a=unhex(code) ORDER BY code;
- Warnings:
- Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1

storage/pbxt/mysql-test/main/r/ctype_gb2312.rdiff

---- r/ctype_gb2312.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/ctype_gb2312.reject	2012-02-10 15:27:03.000000000 +0100
-@@ -80,7 +80,7 @@
- t1	CREATE TABLE `t1` (
-   `name` varchar(10) DEFAULT NULL,
-   `level` smallint(5) unsigned DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=gb2312
-+) ENGINE=PBXT DEFAULT CHARSET=gb2312
- insert into t1 values ('string',1);
- select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
- concat(name,space(level))	concat(name, repeat(' ',level))
-@@ -260,7 +260,7 @@
- t1	CREATE TABLE `t1` (
-   `code` varchar(8) DEFAULT NULL,
-   `a` varchar(1) CHARACTER SET gb2312 NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- UPDATE t1 SET a=unhex(code) ORDER BY code;
- Warnings:
- Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1

storage/pbxt/mysql-test/main/r/ctype_gbk.rdiff

---- r/ctype_gbk.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/ctype_gbk.reject	2012-02-10 15:27:07.000000000 +0100
-@@ -80,7 +80,7 @@
- t1	CREATE TABLE `t1` (
-   `name` varchar(10) DEFAULT NULL,
-   `level` smallint(5) unsigned DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=gbk
-+) ENGINE=PBXT DEFAULT CHARSET=gbk
- insert into t1 values ('string',1);
- select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
- concat(name,space(level))	concat(name, repeat(' ',level))
-@@ -245,7 +245,7 @@
- t1	CREATE TABLE `t1` (
-   `c1` mediumtext NOT NULL,
-   `c2` text NOT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=gbk
-+) ENGINE=PBXT DEFAULT CHARSET=gbk
- drop table t1;
- CREATE TABLE t1(a MEDIUMTEXT CHARACTER SET gbk,
- b MEDIUMTEXT CHARACTER SET big5);
-@@ -280,7 +280,7 @@
- t1	CREATE TABLE `t1` (
-   `code` varchar(8) DEFAULT NULL,
-   `a` varchar(1) CHARACTER SET gbk NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- UPDATE t1 SET a=unhex(code) ORDER BY code;
- Warnings:
- Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1

storage/pbxt/mysql-test/main/r/ctype_mb.rdiff

---- r/ctype_mb.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/ctype_mb.reject	2012-02-10 15:27:18.000000000 +0100
-@@ -5,7 +5,7 @@
- t1	CREATE TABLE `t1` (
-   `c1` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT '',
-   `c2` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- DELETE FROM t1;
- ALTER TABLE t1 ADD c3 CHAR(4) CHARACTER SET utf8;
- SHOW CREATE TABLE t1;
-@@ -14,7 +14,7 @@
-   `c1` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT '',
-   `c2` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT '',
-   `c3` char(4) CHARACTER SET utf8 DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- INSERT INTO t1 VALUES ('aaaabbbbccccdddd','aaaabbbbccccdddd','aaaabbbbccccdddd');
- Warnings:
- Warning	1265	Data truncated for column 'c1' at row 1
-@@ -30,28 +30,28 @@
- t1	CREATE TABLE `t1` (
-   `a` char(4) CHARACTER SET utf8 DEFAULT NULL,
-   KEY `key_a` (`a`(3))
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- SHOW KEYS 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	key_a	1	a	A	NULL	3	NULL	YES	BTREE		
-+t1	1	key_a	1	a	A	0	3	NULL	YES	BTREE		
- ALTER TABLE t1 CHANGE a a CHAR(4);
- SHOW CREATE TABLE t1;
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` char(4) DEFAULT NULL,
-   KEY `key_a` (`a`(3))
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- SHOW KEYS 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	key_a	1	a	A	NULL	3	NULL	YES	BTREE		
-+t1	1	key_a	1	a	A	0	3	NULL	YES	BTREE		
- ALTER TABLE t1 CHANGE a a CHAR(4) CHARACTER SET utf8;
- SHOW CREATE TABLE t1;
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` char(4) CHARACTER SET utf8 DEFAULT NULL,
-   KEY `key_a` (`a`(3))
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- SHOW KEYS 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	key_a	1	a	A	NULL	3	NULL	YES	BTREE		
-+t1	1	key_a	1	a	A	0	3	NULL	YES	BTREE		
- DROP TABLE t1;

storage/pbxt/mysql-test/main/r/ctype_recoding.rdiff

---- r/ctype_recoding.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/ctype_recoding.reject	2012-02-10 15:27:20.000000000 +0100
-@@ -7,7 +7,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` char(10) CHARACTER SET cp1251 DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- SELECT a FROM t1;
- a
- 
-@@ -31,7 +31,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` text CHARACTER SET cp1251
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- SELECT HEX(a) FROM t1;
- HEX(a)
- EFF0EEE1E0
-@@ -51,7 +51,7 @@
- Table	Create Table
- 	CREATE TABLE `` (
-   `` char(32) CHARACTER SET koi8r NOT NULL COMMENT ' '
--) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT=' '
-+) ENGINE=PBXT DEFAULT CHARSET=latin1 COMMENT=' '
- SHOW FIELDS FROM ;
- Field	Type	Null	Key	Default	Extra
- 	char(32)	NO		NULL	
-@@ -63,7 +63,7 @@
- Table	Create Table
- 	CREATE TABLE `` (
-   `` char(32) CHARACTER SET koi8r NOT NULL COMMENT ' '
--) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT=' '
-+) ENGINE=PBXT DEFAULT CHARSET=latin1 COMMENT=' '
- SHOW FIELDS FROM ;
- Field	Type	Null	Key	Default	Extra
- 	char(32)	NO		NULL	
-@@ -75,7 +75,7 @@
- Table	Create Table
- таблица	CREATE TABLE `таблица` (
-   `поле` char(32) CHARACTER SET koi8r NOT NULL COMMENT 'комментарий поля'
--) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='комментарий таблицы'
-+) ENGINE=PBXT DEFAULT CHARSET=latin1 COMMENT='комментарий таблицы'
- SHOW FIELDS FROM таблица;
- Field	Type	Null	Key	Default	Extra
- поле	char(32)	NO		NULL	
-@@ -118,13 +118,13 @@
- Table	Create Table
- тест	CREATE TABLE `тест` (
-   `тест` int(11) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- SET NAMES utf8;
- SHOW CREATE TABLE `тест`;
- Table	Create Table
- тест	CREATE TABLE `тест` (
-   `тест` int(11) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- DROP TABLE `тест`;
- SET NAMES binary;
- SET character_set_connection=utf8;
-@@ -143,7 +143,7 @@
- t1	CREATE TABLE `t1` (
-   `` char(128) DEFAULT '',
-   `1` enum('1','2') DEFAULT '2'
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- SHOW COLUMNS FROM t1;
- Field	Type	Null	Key	Default	Extra
- 	char(128)	YES			
-@@ -154,7 +154,7 @@
- t1	CREATE TABLE `t1` (
-   `ä` char(128) DEFAULT 'ä',
-   `ä1` enum('ä1','ä2') DEFAULT 'ä2'
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- SHOW COLUMNS FROM t1;
- Field	Type	Null	Key	Default	Extra
- ä	char(128)	YES		ä	
-@@ -262,7 +262,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` char(1) CHARACTER SET cp1251 DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- create table t1(a char character set latin1 default _cp1251 0xFF);
- ERROR 42000: Invalid default value for 'a'

storage/pbxt/mysql-test/main/r/ctype_sjis.rdiff

---- r/ctype_sjis.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/ctype_sjis.reject	2012-02-10 15:27:25.000000000 +0100
-@@ -52,7 +52,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `c` enum('S','s') CHARACTER SET sjis DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- insert into t1 values (0x9353);
- insert into t1 values (0x9373);
- select hex(c) from t1;
-@@ -252,7 +252,7 @@
- t1	CREATE TABLE `t1` (
-   `code` varchar(8) DEFAULT NULL,
-   `a` varchar(1) CHARACTER SET sjis NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- UPDATE t1 SET a=unhex(code) ORDER BY code;
- Warnings:
- Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1

storage/pbxt/mysql-test/main/r/ctype_ujis.rdiff

---- r/ctype_ujis.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/ctype_ujis.reject	2012-02-10 15:27:43.000000000 +0100
-@@ -120,7 +120,7 @@
- t1	CREATE TABLE `t1` (
-   `a` char(1) NOT NULL DEFAULT '',
-   `b` enum('','') DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=ujis
-+) ENGINE=PBXT DEFAULT CHARSET=ujis
- SHOW COLUMNS FROM t1;
- Field	Type	Null	Key	Default	Extra
- a	char(1)	NO			
-@@ -2419,7 +2419,7 @@
- t1	CREATE TABLE `t1` (
-   `code` varchar(6) CHARACTER SET ujis NOT NULL DEFAULT '',
-   `a` varchar(1) CHARACTER SET ujis NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- UPDATE t1 SET a=unhex(code) ORDER BY code;
- Warnings:
- Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1

storage/pbxt/mysql-test/main/r/ctype_utf32_uca.rdiff

---- r/ctype_utf32_uca.result	2011-11-22 18:50:25.000000000 +0100
-+++ r/ctype_utf32_uca.reject	2012-02-10 15:28:02.000000000 +0100
-@@ -2250,7 +2250,7 @@
- t1	CREATE TABLE `t1` (
-   `name` varchar(10) COLLATE utf32_swedish_ci DEFAULT NULL,
-   `level` smallint(5) unsigned DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_swedish_ci
-+) ENGINE=PBXT DEFAULT CHARSET=utf32 COLLATE=utf32_swedish_ci
- insert into t1 values ('string',1);
- select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
- concat(name,space(level))	concat(name, repeat(' ',level))
-@@ -2335,7 +2335,7 @@
- t1	CREATE TABLE `t1` (
-   `s1` varchar(64) CHARACTER SET utf32 COLLATE utf32_unicode_ci DEFAULT NULL,
-   `s2` varchar(64) CHARACTER SET utf32 COLLATE utf32_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- delete from t1;
- insert into t1 values('aaa','aaa');
- insert into t1 values('aaa|qqq','qqq');

storage/pbxt/mysql-test/main/r/ctype_utf8mb4_heap.rdiff

---- r/ctype_utf8mb4_heap.result	2012-02-10 15:42:03.000000000 +0100
-+++ r/ctype_utf8mb4_heap.reject	2012-02-10 15:42:17.000000000 +0100
-@@ -271,7 +271,7 @@
- t1	CREATE TABLE `t1` (
-   `s1` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL,
-   `s2` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- delete from t1;
- insert into t1 values('aaa','aaa');
- insert into t1 values('aaa|qqq','qqq');

storage/pbxt/mysql-test/main/r/ctype_utf8mb4_myisam.rdiff

---- r/ctype_utf8mb4_myisam.result	2011-10-21 23:35:26.000000000 +0200
-+++ r/ctype_utf8mb4_myisam.reject	2012-02-10 15:28:10.000000000 +0100
-@@ -281,7 +281,7 @@
- t1	CREATE TABLE `t1` (
-   `s1` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL,
-   `s2` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- delete from t1;
- insert into t1 values('aaa','aaa');
- insert into t1 values('aaa|qqq','qqq');

storage/pbxt/mysql-test/main/r/ddl_i18n_koi8r.rdiff

---- r/ddl_i18n_koi8r.result	2012-02-10 15:47:25.000000000 +0100
-+++ r/ddl_i18n_koi8r.reject	2012-02-10 15:47:39.000000000 +0100
-@@ -1733,13 +1733,13 @@
- /*!40101 SET character_set_client = utf8 */;
- CREATE TABLE `log` (
-   `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
- /*!40101 SET character_set_client = @saved_cs_client */;
- /*!40101 SET @saved_cs_client     = @@character_set_client */;
- /*!40101 SET character_set_client = utf8 */;
- CREATE TABLE `t1` (
-   `c` int(11) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
- /*!40101 SET character_set_client = @saved_cs_client */;
- INSERT INTO `t1` VALUES (1),(0),(1);
- ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-@@ -1812,13 +1812,13 @@
- /*!40101 SET character_set_client = utf8 */;
- CREATE TABLE `log` (
-   `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
- /*!40101 SET character_set_client = @saved_cs_client */;
- /*!40101 SET @saved_cs_client     = @@character_set_client */;
- /*!40101 SET character_set_client = utf8 */;
- CREATE TABLE `t1` (
-   `c` int(11) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
- /*!40101 SET character_set_client = @saved_cs_client */;
- INSERT INTO `t1` VALUES (1),(0),(1);
- ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-@@ -2778,26 +2778,26 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
- 
- SHOW CREATE TABLE t1|
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
- 
- 
- CALL mysqltest2.p2()|
- Table	Create Table
- t2	CREATE TABLE `t2` (
-   `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
- 
- SHOW CREATE TABLE mysqltest2.t2|
- Table	Create Table
- t2	CREATE TABLE `t2` (
-   `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
- 
- ALTER DATABASE mysqltest1 COLLATE cp1251_general_cs|
- ALTER DATABASE mysqltest2 COLLATE cp1251_general_cs|
-@@ -2808,26 +2808,26 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `col1` varchar(10) COLLATE cp1251_general_cs DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
-+) ENGINE=PBXT DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
- 
- SHOW CREATE TABLE t1|
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `col1` varchar(10) COLLATE cp1251_general_cs DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
-+) ENGINE=PBXT DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
- 
- 
- CALL mysqltest2.p2()|
- Table	Create Table
- t2	CREATE TABLE `t2` (
-   `col1` varchar(10) COLLATE cp1251_general_cs DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
-+) ENGINE=PBXT DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
- 
- SHOW CREATE TABLE mysqltest2.t2|
- Table	Create Table
- t2	CREATE TABLE `t2` (
-   `col1` varchar(10) COLLATE cp1251_general_cs DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
-+) ENGINE=PBXT DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
- 
- ---> connection: con2
- 

storage/pbxt/mysql-test/main/r/ddl_i18n_utf8.rdiff

---- r/ddl_i18n_utf8.result	2012-02-10 15:48:13.000000000 +0100
-+++ r/ddl_i18n_utf8.reject	2012-02-10 15:48:46.000000000 +0100
-@@ -1733,13 +1733,13 @@
- /*!40101 SET character_set_client = utf8 */;
- CREATE TABLE `log` (
-   `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
- /*!40101 SET character_set_client = @saved_cs_client */;
- /*!40101 SET @saved_cs_client     = @@character_set_client */;
- /*!40101 SET character_set_client = utf8 */;
- CREATE TABLE `t1` (
-   `c` int(11) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
- /*!40101 SET character_set_client = @saved_cs_client */;
- INSERT INTO `t1` VALUES (1),(0),(1);
- ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-@@ -1812,13 +1812,13 @@
- /*!40101 SET character_set_client = utf8 */;
- CREATE TABLE `log` (
-   `msg` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
- /*!40101 SET character_set_client = @saved_cs_client */;
- /*!40101 SET @saved_cs_client     = @@character_set_client */;
- /*!40101 SET character_set_client = utf8 */;
- CREATE TABLE `t1` (
-   `c` int(11) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
- /*!40101 SET character_set_client = @saved_cs_client */;
- INSERT INTO `t1` VALUES (1),(0),(1);
- ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-@@ -2778,26 +2778,26 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
- 
- SHOW CREATE TABLE t1|
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
- 
- 
- CALL mysqltest2.p2()|
- Table	Create Table
- t2	CREATE TABLE `t2` (
-   `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
- 
- SHOW CREATE TABLE mysqltest2.t2|
- Table	Create Table
- t2	CREATE TABLE `t2` (
-   `col1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
-+) ENGINE=PBXT DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
- 
- ALTER DATABASE mysqltest1 COLLATE cp1251_general_cs|
- ALTER DATABASE mysqltest2 COLLATE cp1251_general_cs|
-@@ -2808,26 +2808,26 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `col1` varchar(10) COLLATE cp1251_general_cs DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
-+) ENGINE=PBXT DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
- 
- SHOW CREATE TABLE t1|
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `col1` varchar(10) COLLATE cp1251_general_cs DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
-+) ENGINE=PBXT DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
- 
- 
- CALL mysqltest2.p2()|
- Table	Create Table
- t2	CREATE TABLE `t2` (
-   `col1` varchar(10) COLLATE cp1251_general_cs DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
-+) ENGINE=PBXT DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
- 
- SHOW CREATE TABLE mysqltest2.t2|
- Table	Create Table
- t2	CREATE TABLE `t2` (
-   `col1` varchar(10) COLLATE cp1251_general_cs DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
-+) ENGINE=PBXT DEFAULT CHARSET=cp1251 COLLATE=cp1251_general_cs
- 
- ---> connection: con2
- 

storage/pbxt/mysql-test/main/r/derived.rdiff

---- r/derived.result	2012-01-11 18:00:58.000000000 +0100
-+++ r/derived.reject	2012-02-10 15:28:40.000000000 +0100
-@@ -116,8 +116,8 @@
- explain select * from (select t1.*, t2.a as t2a from t1,t2 where t1.a=t2.a) t1;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
- 1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	
--2	DERIVED	t2	system	NULL	NULL	NULL	NULL	1	
--2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-+2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	1	
-+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	4	Using where; Using join buffer (flat, BNL join)
- drop table t1, t2;
- create table t1(a int not null, t char(8), index(a));
- SELECT * FROM (SELECT * FROM t1) as b ORDER BY a  ASC LIMIT 0,20;

storage/pbxt/mysql-test/main/r/derived_opt.rdiff

---- r/derived_opt.result	2011-10-21 23:35:26.000000000 +0200
-+++ r/derived_opt.reject	2012-02-10 15:28:56.000000000 +0100
-@@ -38,8 +38,8 @@
- 1	a	1
- explain select * from (select t1.*, t2.a as t2a from t1,t2 where t1.a=t2.a) t1;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t2	system	NULL	NULL	NULL	NULL	1	
--1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where
-+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	1	
-+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where; Using join buffer (flat, BNL join)
- drop table t1, t2;
- create table t1(a int not null, t char(8), index(a));
- SELECT * FROM (SELECT * FROM t1) as b ORDER BY a  ASC LIMIT 0,20;
-@@ -66,7 +66,8 @@
- 20	20
- explain select count(*) from t1 as tt1, (select * from t1) as tt2;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
-+1	SIMPLE	tt1	index	NULL	a	4	NULL	10000	Using index
-+1	SIMPLE	t1	index	NULL	a	4	NULL	10000	Using index; Using join buffer (flat, BNL join)
- drop table t1;
- create table t1 (mat_id MEDIUMINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, matintnum CHAR(6) NOT NULL, test MEDIUMINT UNSIGNED NULL);
- create table t2 (mat_id MEDIUMINT UNSIGNED NOT NULL, pla_id MEDIUMINT UNSIGNED NOT NULL);
-@@ -193,9 +194,9 @@
- EXPLAIN
- SELECT * FROM (SELECT DISTINCT * FROM t2) t, t1  WHERE t1.a = t.a;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	
--1	PRIMARY	t1	ref	a	a	5	const	1	Using index
--2	DERIVED	t2	system	NULL	NULL	NULL	NULL	1	
-+1	PRIMARY	<derived2>	ALL	key0	NULL	NULL	NULL	2	Using where
-+1	PRIMARY	t1	ref	a	a	5	t.a	1	Using index
-+2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	1	Using temporary
- SELECT * FROM (SELECT DISTINCT * FROM t2) t, t1  WHERE t1.a = t.a;
- a	a
- 3	3
-@@ -230,8 +231,8 @@
- EXPLAIN
- SELECT * FROM v1, t1 WHERE v1.b=t1.a  ORDER BY v1.a;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	PRIMARY	t1	system	NULL	NULL	NULL	NULL	1	Using filesort
--1	PRIMARY	<derived2>	ref	key0	key0	5	const	1	Using where
-+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	1	Using where; Using temporary; Using filesort
-+1	PRIMARY	<derived2>	ref	key0	key0	5	test.t1.a	2	
- 2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	10	Using temporary; Using filesort
- SELECT * FROM v1, t1 WHERE v1.b=t1.a  ORDER BY v1.a;
- a	b	a

storage/pbxt/mysql-test/main/r/distinct.rdiff

---- r/distinct.result	2012-01-09 16:13:21.000000000 +0100
-+++ r/distinct.reject	2012-02-10 15:29:05.000000000 +0100
-@@ -174,8 +174,8 @@
- explain SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
- 1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	4	Using where; Using temporary
--1	SIMPLE	t3	ref	a	a	5	test.t1.b	2	Using index
--1	SIMPLE	t2	index	a	a	4	NULL	5	Using where; Using index; Distinct; Using join buffer (flat, BNL join)
-+1	SIMPLE	t2	ref	a	a	4	test.t1.a	1	Using index
-+1	SIMPLE	t3	ref	a	a	5	test.t1.b	1	Using index
- SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a;
- a
- 1
-@@ -190,7 +190,7 @@
- explain select distinct t1.a from t1,t3 where t1.a=t3.a;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
- 1	SIMPLE	t1	index	PRIMARY	PRIMARY	4	NULL	4	Using index; Using temporary
--1	SIMPLE	t3	ref	a	a	5	test.t1.a	11	Using index; Distinct
-+1	SIMPLE	t3	ref	a	a	5	test.t1.a	1	Using index; Distinct
- select distinct t1.a from t1,t3 where t1.a=t3.a;
- a
- 1
-@@ -212,7 +212,7 @@
- 1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	1	Using index
- explain SELECT distinct a from t3 order by a desc limit 2;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t3	index	NULL	a	5	NULL	40	Using index
-+1	SIMPLE	t3	index	NULL	a	5	NULL	2	Using index
- explain SELECT distinct a,b from t3 order by a+1;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
- 1	SIMPLE	t3	ALL	NULL	NULL	NULL	NULL	204	Using temporary; Using filesort
-@@ -756,7 +756,7 @@
- (1, 2, 3);
- EXPLAIN SELECT DISTINCT a, b, d, c FROM t1;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	range	NULL	PRIMARY	16	NULL	7	Using index for group-by; Using temporary
-+1	SIMPLE	t1	index	NULL	a	16	NULL	6	Using index
- SELECT DISTINCT a, b, d, c FROM t1;
- a	b	d	c
- 1	1	0	1

storage/pbxt/mysql-test/main/r/drop.rdiff

---- r/drop.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/drop.reject	2012-02-10 15:29:08.000000000 +0100
-@@ -50,6 +50,7 @@
- mtr
- mysql
- mysqltest
-+pbxt
- performance_schema
- test
- flush tables with read lock;
-@@ -62,6 +63,7 @@
- information_schema
- mtr
- mysql
-+pbxt
- performance_schema
- test
- drop database mysqltest;

storage/pbxt/mysql-test/main/r/endspace.rdiff

---- r/endspace.result	2012-01-11 17:33:46.000000000 +0100
-+++ r/endspace.reject	2012-02-10 15:29:32.000000000 +0100
-@@ -100,7 +100,7 @@
- |teststring |
- explain select concat('|', text1, '|') from t1 where text1='teststring ';
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	ref	key1	key1	22	const	2	Using where
-+1	SIMPLE	t1	ref	key1	key1	22	const	1	Using where
- select concat('|', text1, '|') from t1 where text1 like 'teststring_%';
- concat('|', text1, '|')
- |teststring	|

storage/pbxt/mysql-test/main/r/errors.rdiff

---- r/errors.result	2011-10-21 23:35:26.000000000 +0200
-+++ r/errors.reject	2012-02-10 15:29:36.000000000 +0100
-@@ -84,7 +84,6 @@
- Com_insert	2
- select * from t1;
- a
--1
- select * from t2;
- a
- drop table t1;

storage/pbxt/mysql-test/main/r/func_compress.rdiff

---- r/func_compress.result	2011-11-23 18:58:14.000000000 +0100
-+++ r/func_compress.reject	2012-02-10 15:31:17.000000000 +0100
-@@ -94,18 +94,15 @@
- insert into t1 values ('foo');
- explain select * from t1 where uncompress(a) is null;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	
--Warnings:
--Warning	1259	ZLIB: Input data corrupted
-+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1	Using where
- select * from t1 where uncompress(a) is null;
- a
- foo
- Warnings:
- Warning	1259	ZLIB: Input data corrupted
--Warning	1259	ZLIB: Input data corrupted
- explain select *, uncompress(a) from t1;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	
-+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1	
- select *, uncompress(a) from t1;
- a	uncompress(a)
- foo	NULL

storage/pbxt/mysql-test/main/r/func_default.rdiff

---- r/func_default.result	2011-10-21 23:35:26.000000000 +0200
-+++ r/func_default.reject	2012-02-10 15:31:19.000000000 +0100
-@@ -6,15 +6,15 @@
- def	NULL	10	3.14
- explain extended select default(str), default(strnull), default(intg), default(rel) from t1;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
--1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	100.00	
-+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1	100.00	
- Warnings:
--Note	1003	select default('') AS `default(str)`,default('') AS `default(strnull)`,default(0) AS `default(intg)`,default(0) AS `default(rel)` from dual
-+Note	1003	select default(`test`.`t1`.`str`) AS `default(str)`,default(`test`.`t1`.`strnull`) AS `default(strnull)`,default(`test`.`t1`.`intg`) AS `default(intg)`,default(`test`.`t1`.`rel`) AS `default(rel)` from `test`.`t1`
- select * from t1 where str <> default(str);
- str	strnull	intg	rel
- 		0	0
- explain select * from t1 where str <> default(str);
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	
-+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1	Using where
- drop table t1;
- CREATE TABLE t1 (id int(11), s varchar(20));
- INSERT INTO t1 VALUES (1, 'one'), (2, 'two'), (3, 'three');

storage/pbxt/mysql-test/main/r/func_group.rdiff

---- r/func_group.result	2012-02-23 15:57:49.000000000 +0100
-+++ /usr/home/serg/Abk/mysql/5.5-mtr/storage/pbxt/mysql-test/main/r/func_group.reject	2012-02-23 23:01:47.000000000 +0100
-@@ -604,7 +604,7 @@
- explain 
- select min(a1) from t1 where a1 > 'KKK' or a1 < 'XXX';
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	index	PRIMARY	PRIMARY	3	NULL	15	Using where; Using index
-+1	SIMPLE	t1	range	PRIMARY	PRIMARY	0	NULL	1	Using where; Using index
- explain 
- select min(a1) from t1 where a1 != 'KKK';
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-@@ -612,12 +612,12 @@
- explain
- select max(a3) from t1 where a2 < 2 and a3 < 'SEA';
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	range	k1	k1	3	NULL	6	Using where; Using index
-+1	SIMPLE	t1	range	k1	k1	3	NULL	1	Using where; Using index
- explain
- select max(t1.a3), min(t2.a2) from t1, t2 where t1.a2 = 2 and t1.a3 < 'MIN' and t2.a3 > 'CA';
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
- 1	SIMPLE	t1	range	k1	k1	7	NULL	1	Using where; Using index
--1	SIMPLE	t2	range	k1	k1	3	NULL	4	Using where; Using index; Using join buffer (flat, BNL join)
-+1	SIMPLE	t2	range	k1	k1	3	NULL	1	Using where; Using index; Using join buffer (flat, BNL join)
- explain
- select min(a4 - 0.01) from t1;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-@@ -653,7 +653,7 @@
- explain
- select concat(min(t1.a1),min(t2.a4)) from t1, t2 where t2.a4 <> 'AME';
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t2	range	k2	k2	4	NULL	6	Using where; Using index
-+1	SIMPLE	t2	index	k2	k2	4	NULL	7	Using where; Using index
- 1	SIMPLE	t1	index	NULL	PRIMARY	3	NULL	15	Using index; Using join buffer (flat, BNL join)
- drop table t1, t2;
- create table t1 (a char(10));
-@@ -672,21 +672,21 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` char(1) CHARACTER SET latin2 DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- create table t2 select max(a),min(a) from t1;
- show create table t2;
- Table	Create Table
- t2	CREATE TABLE `t2` (
-   `max(a)` char(1) CHARACTER SET latin2 DEFAULT NULL,
-   `min(a)` char(1) CHARACTER SET latin2 DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t2;
- create table t2 select concat(a) from t1;
- show create table t2;
- Table	Create Table
- t2	CREATE TABLE `t2` (
-   `concat(a)` varchar(1) CHARACTER SET latin2 DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t2,t1;
- create table t1 (a int);
- insert into t1 values (1);
-@@ -775,7 +775,7 @@
- Table	Create Table
- t2	CREATE TABLE `t2` (
-   `MAX(b)` datetime DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1, t2;
- create table t1(f1 datetime);
- insert into t1 values (now());
-@@ -951,33 +951,33 @@
- (3,3,1), (3,3,2), (3,3,3);
- SELECT b/c as v, a FROM t1 ORDER BY v;
- v	a
--0.33333	3
- 0.33333	1
- 0.33333	2
-+0.33333	3
- 0.50000	1
- 0.50000	2
- 0.50000	3
--0.66667	2
- 0.66667	1
-+0.66667	2
- 0.66667	3
--1.00000	3
--1.00000	2
--1.00000	3
- 1.00000	1
--1.00000	2
--1.00000	3
--1.00000	2
- 1.00000	1
- 1.00000	1
--1.50000	3
--1.50000	2
-+1.00000	2
-+1.00000	2
-+1.00000	2
-+1.00000	3
-+1.00000	3
-+1.00000	3
- 1.50000	1
-+1.50000	2
-+1.50000	3
- 2.00000	1
--2.00000	3
- 2.00000	2
--3.00000	3
--3.00000	2
-+2.00000	3
- 3.00000	1
-+3.00000	2
-+3.00000	3
- SELECT b/c as v, SUM(a) FROM t1 GROUP BY v;
- v	SUM(a)
- 0.33333	6
-@@ -1014,14 +1014,14 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `variance(0)` double(8,4) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- create table t1 select stddev(0);
- show create table t1;
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `stddev(0)` double(8,4) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- create table bug22555 (i smallint primary key auto_increment, s1 smallint, s2 smallint, e decimal(30,10), o double);
- insert into bug22555 (s1, s2, e, o) values (53, 78, 11.4276528, 6.828112), (17, 78, 5.916793, 1.8502951), (18, 76, 2.679231, 9.17975591), (31, 62, 6.07831, 0.1), (19, 41, 5.37463, 15.1), (83, 73, 14.567426, 7.959222), (92, 53, 6.10151, 13.1856852), (7, 12, 13.92272, 3.442007), (92, 35, 11.95358909, 6.01376678), (38, 84, 2.572, 7.904571);
-@@ -1336,7 +1336,7 @@
- INSERT INTO t2 ( a, b, c ) VALUES ( 1, NULL, 2 ), ( 1, 3, 4 ), ( 1, 4, 4 );
- EXPLAIN SELECT MIN(b), MIN(c) FROM t2 WHERE a = 1;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t2	ref	a	a	5	const	2	
-+1	SIMPLE	t2	ref	a	a	5	const	1	
- SELECT MIN(b), MIN(c) FROM t2 WHERE a = 1;
- MIN(b)	MIN(c)
- 3	2
-@@ -1835,7 +1835,7 @@
- EXPLAIN EXTENDED
- SELECT MAX(a) FROM t1 WHERE (1,2) IN (SELECT 3,4) AND a<10;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
--1	PRIMARY	t1	range	a	a	4	NULL	4	100.00	Using where; Using index
-+1	PRIMARY	t1	range	a	a	4	NULL	1	100.00	Using where; Using index
- 2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
- Warnings:
- Note	1003	select max(`test`.`t1`.`a`) AS `MAX(a)` from `test`.`t1` where (<expr_cache><<cache>(1),<cache>(2)>(<in_optimizer>(<cache>((1,2)),<exists>(select 3,4 having (((1 = 3) or isnull(3)) and ((2 = 4) or isnull(4)) and <is_not_null_test>(3) and <is_not_null_test>(4))))) and (`test`.`t1`.`a` < 10))
-@@ -1845,8 +1845,8 @@
- EXPLAIN EXTENDED
- SELECT MAX(a) FROM t1 WHERE (1,2) IN (SELECT a,b FROM t2 WHERE b<5) and a<10;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-+1	PRIMARY	t1	range	a	a	4	NULL	1	100.00	Using where; Using index
- 1	PRIMARY	<subquery2>	eq_ref	distinct_key	distinct_key	10	func,func	1	100.00	
--1	PRIMARY	t1	range	a	a	4	NULL	4	100.00	Using where; Using index; Using join buffer (flat, BNL join)
- 2	MATERIALIZED	t2	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where
- Warnings:
- Note	1003	select max(`test`.`t1`.`a`) AS `MAX(a)` from `test`.`t1` semi join (`test`.`t2`) where ((`test`.`t2`.`b` = 2) and (`test`.`t2`.`a` = 1) and (`test`.`t1`.`a` < 10))
-@@ -1856,7 +1856,7 @@
- EXPLAIN EXTENDED
- SELECT MAX(a) FROM t1 WHERE RAND()*0<>0 AND a<10;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
--1	SIMPLE	t1	range	a	a	4	NULL	4	100.00	Using where; Using index
-+1	SIMPLE	t1	range	a	a	4	NULL	1	100.00	Using where; Using index
- Warnings:
- Note	1003	select max(`test`.`t1`.`a`) AS `MAX(a)` from `test`.`t1` where (((rand() * 0) <> 0) and (`test`.`t1`.`a` < 10))
- SELECT MAX(a) FROM t1 WHERE RAND()*0<>0 AND a<10;
-@@ -1876,11 +1876,11 @@
- SELECT (SELECT MIN(t1.a) FROM t1,t2 WHERE t2.a = t3.b) FROM t3;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
- 1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
--2	DEPENDENT SUBQUERY	t1	system	NULL	NULL	NULL	NULL	1	100.00	
--2	DEPENDENT SUBQUERY	t2	system	NULL	NULL	NULL	NULL	1	100.00	
-+2	DEPENDENT SUBQUERY	t1	index	NULL	PRIMARY	4	NULL	1	100.00	Using index
-+2	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where; Using join buffer (flat, BNL join)
- Warnings:
- Note	1276	Field or reference 'test.t3.b' of SELECT #2 was resolved in SELECT #1
--Note	1003	select <expr_cache><`test`.`t3`.`b`>((select min(1) from dual where (10 = `test`.`t3`.`b`))) AS `(SELECT MIN(t1.a) FROM t1,t2 WHERE t2.a = t3.b)` from `test`.`t3`
-+Note	1003	select <expr_cache><`test`.`t3`.`b`>((select min(`test`.`t1`.`a`) from `test`.`t1` join `test`.`t2` where (`test`.`t2`.`a` = `test`.`t3`.`b`))) AS `(SELECT MIN(t1.a) FROM t1,t2 WHERE t2.a = t3.b)` from `test`.`t3`
- SELECT (SELECT MIN(t1.a) FROM t1,t2 WHERE t2.a = t3.b) FROM t3;
- (SELECT MIN(t1.a) FROM t1,t2 WHERE t2.a = t3.b)
- NULL
-@@ -2006,9 +2006,9 @@
- SELECT v
- FROM t2);
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	0	const row not found
-+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
- 3	MATERIALIZED	t2	ALL	NULL	NULL	NULL	NULL	2	
--2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	no matching row in const table
-+2	DERIVED	empty1	ALL	NULL	NULL	NULL	NULL	0	
- set optimizer_switch=@tmp_optimizer_switch;
- 
- #
-@@ -2035,7 +2035,7 @@
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
- 1	PRIMARY	t1	index	NULL	PRIMARY	4	NULL	2	Using where; Using index
- 3	MATERIALIZED	t2	ALL	NULL	NULL	NULL	NULL	2	
--2	MATERIALIZED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
-+2	MATERIALIZED	t3	index	PRIMARY	PRIMARY	4	NULL	1	Using where; Using index
- set @@optimizer_switch=@save_optimizer_switch;
- #
- # Cleanup for BUG#46680

storage/pbxt/mysql-test/main/r/func_math.rdiff

---- r/func_math.result	2012-01-09 16:13:21.000000000 +0100
-+++ r/func_math.reject	2012-02-10 15:31:40.000000000 +0100
-@@ -166,7 +166,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `round(1, 6)` int(1) NOT NULL DEFAULT '0'
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- select * from t1;
- round(1, 6)
- 1
-@@ -540,7 +540,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `C` varchar(23) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- DROP TABLE t1;
- #
- # Bug#11764994  57900: CREATE TABLE .. SELECT ASSERTS SCALE >= 0 && PRECISION > 0 && SCALE <= PR
-@@ -660,9 +660,9 @@
- CREATE TABLE t1(a BIGINT, b BIGINT UNSIGNED);
- INSERT INTO t1 VALUES(-9223372036854775808, 9223372036854775809);
- SELECT -a FROM t1;
--ERROR 22003: BIGINT value is out of range in '-(-9223372036854775808)'
-+ERROR 22003: BIGINT value is out of range in '-(`test`.`t1`.`a`)'
- SELECT -b FROM t1;
--ERROR 22003: BIGINT value is out of range in '-(9223372036854775809)'
-+ERROR 22003: BIGINT value is out of range in '-(`test`.`t1`.`b`)'
- DROP TABLE t1;
- SET @a:=999999999999999999999999999999999999999999999999999999999999999999999999999999999;
- SELECT @a + @a;

storage/pbxt/mysql-test/main/r/func_misc.rdiff

---- r/func_misc.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/func_misc.reject	2012-02-10 15:31:42.000000000 +0100
-@@ -102,14 +102,14 @@
- t1	CREATE TABLE `t1` (
-   `uuid()` varchar(36) CHARACTER SET utf8 NOT NULL DEFAULT '',
-   `length(uuid())` int(10) NOT NULL DEFAULT '0'
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- create table t1 select INET_ATON('255.255.0.1') as `a`;
- show create table t1;
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `a` bigint(21) unsigned DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- drop table if exists table_26093;
- drop function if exists func_26093_a;

storage/pbxt/mysql-test/main/r/func_regexp.rdiff

---- r/func_regexp.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/func_regexp.reject	2012-02-10 15:31:44.000000000 +0100
-@@ -10,7 +10,7 @@
- t1	CREATE TABLE `t1` (
-   `s1` varchar(64) DEFAULT NULL,
-   `s2` varchar(64) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- delete from t1;
- insert into t1 values('aaa','aaa');
- insert into t1 values('aaa|qqq','qqq');
-@@ -50,9 +50,9 @@
- this is a test of some long text to see what happens
- explain extended select * from t1 where xxx regexp('is a test of some long text to');
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
--1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	100.00	
-+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1	100.00	Using where
- Warnings:
--Note	1003	select 'this is a test of some long text to see what happens' AS `xxx` from dual where ('this is a test of some long text to see what happens' regexp 'is a test of some long text to')
-+Note	1003	select `test`.`t1`.`xxx` AS `xxx` from `test`.`t1` where (`test`.`t1`.`xxx` regexp 'is a test of some long text to')
- select * from t1 where xxx regexp('is a test of some long text to ');
- xxx
- this is a test of some long text to see what happens

storage/pbxt/mysql-test/main/r/func_str.rdiff

---- r/func_str.result	2012-01-13 16:50:49.000000000 +0100
-+++ r/func_str.reject	2012-02-10 15:31:48.000000000 +0100
-@@ -751,7 +751,7 @@
-   `insert(_latin2'abcd',2,3,_latin2'ef')` varchar(6) CHARACTER SET latin2 NOT NULL DEFAULT '',
-   `replace(_latin2'abcd',_latin2'b',_latin2'B')` varchar(4) CHARACTER SET latin2 NOT NULL DEFAULT '',
-   `encode('abcd','ab')` varbinary(4) NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- create table t1 (a char character set latin2);
- insert into t1 values (null);
-@@ -1153,7 +1153,6 @@
- notnumber	0
- Warnings:
- Warning	1292	Truncated incorrect DOUBLE value: 'notnumber'
--Warning	1292	Truncated incorrect DOUBLE value: 'notnumber'
- SELECT * FROM t1, t2 WHERE num=substring(str from 1 for 6);
- str	num
- notnumber	0
-@@ -1308,14 +1307,14 @@
- create table t1(f1 varchar(4));
- explain extended select encode(f1,'zxcv') as 'enc' from t1;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
--1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	0	0.00	const row not found
-+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	0	0.00	
- Warnings:
--Note	1003	select encode(NULL,'zxcv') AS `enc` from `test`.`t1`
-+Note	1003	select encode(`test`.`t1`.`f1`,'zxcv') AS `enc` from `test`.`t1`
- explain extended select decode(f1,'zxcv') as 'enc' from t1;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
--1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	0	0.00	const row not found
-+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	0	0.00	
- Warnings:
--Note	1003	select decode(NULL,'zxcv') AS `enc` from `test`.`t1`
-+Note	1003	select decode(`test`.`t1`.`f1`,'zxcv') AS `enc` from `test`.`t1`
- drop table t1;
- create table t1 (a bigint not null)engine=myisam;
- insert into t1 set a = 1024*1024*1024*4;
-@@ -2782,7 +2781,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `format(123,2,'no_NO')` varchar(37) NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- SELECT * FROM t1;
- format(123,2,'no_NO')
- 123,00

storage/pbxt/mysql-test/main/r/func_system.rdiff

---- r/func_system.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/func_system.reject	2012-02-10 15:32:02.000000000 +0100
-@@ -49,7 +49,7 @@
-   `database()` varchar(34) CHARACTER SET utf8 DEFAULT NULL,
-   `user()` varchar(77) CHARACTER SET utf8 NOT NULL DEFAULT '',
-   `version` char(60) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- select charset(charset(_utf8'a')), charset(collation(_utf8'a'));
- charset(charset(_utf8'a'))	charset(collation(_utf8'a'))
-@@ -63,7 +63,7 @@
- t1	CREATE TABLE `t1` (
-   `charset(_utf8'a')` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '',
-   `collation(_utf8'a')` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT ''
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- select TRUE,FALSE,NULL;
- TRUE	FALSE	NULL

storage/pbxt/mysql-test/main/r/func_test.rdiff

---- r/func_test.result	2011-10-21 23:35:26.000000000 +0200
-+++ r/func_test.reject	2012-02-10 15:32:04.000000000 +0100
-@@ -85,9 +85,9 @@
- -1
- explain extended select - a from t1;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
--1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	100.00	
-+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1	100.00	
- Warnings:
--Note	1003	select -(1) AS `- a` from dual
-+Note	1003	select -(`test`.`t1`.`a`) AS `- a` from `test`.`t1`
- drop table t1;
- select 5 between 0 and 10 between 0 and 1,(5 between 0 and 10) between 0 and 1;
- 5 between 0 and 10 between 0 and 1	(5 between 0 and 10) between 0 and 1

storage/pbxt/mysql-test/main/r/func_time.rdiff

---- r/func_time.result	2012-01-09 16:13:21.000000000 +0100
-+++ r/func_time.reject	2012-02-10 15:32:23.000000000 +0100
-@@ -958,7 +958,7 @@
-   `curtime() - curtime()` decimal(11,0) NOT NULL DEFAULT '0',
-   `sec_to_time(1) + 0` decimal(11,0) DEFAULT NULL,
-   `from_unixtime(1) + 0` decimal(20,0) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- drop table t1;
- SELECT SEC_TO_TIME(3300000);
- SEC_TO_TIME(3300000)

storage/pbxt/mysql-test/main/r/func_time_hires.rdiff

---- r/func_time_hires.result	2011-10-21 23:35:26.000000000 +0200
-+++ r/func_time_hires.reject	2012-02-10 15:32:25.000000000 +0100
-@@ -49,7 +49,7 @@
-   `localtimestamp(6)` datetime(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
-   `time_to_sec(123456)` bigint(17) DEFAULT NULL,
-   `time_to_sec('12:34:56.789')` decimal(22,6) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- select * from t1;
- sec_to_time(12345)	03:25:45
- sec_to_time(12345.6789)	03:25:45.6789
-@@ -133,7 +133,7 @@
-   `t4` time(4) DEFAULT NULL,
-   `t5` time(5) DEFAULT NULL,
-   `t6` time(6) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- select * from t1;
- dauto	2011-01-02 12:13:14
- d0	2011-01-02 12:13:14

storage/pbxt/mysql-test/main/r/grant2.rdiff

---- r/grant2.result	2011-12-13 12:00:39.000000000 +0100
-+++ r/grant2.reject	2012-02-10 16:04:41.000000000 +0100
-@@ -401,7 +401,7 @@
- Table	Create Table
- t1	CREATE TABLE `t1` (
-   `i` int(11) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- create table t1 like mysqltest_2.t1;
- use test;
- drop database mysqltest_1;

storage/pbxt/mysql-test/main/r/grant4.rdiff

---- r/grant4.result	2011-10-21 23:09:08.000000000 +0200
-+++ r/grant4.reject	2012-02-10 16:04:43.000000000 +0100
-@@ -64,7 +64,7 @@
- t_select_priv	CREATE TABLE `t_select_priv` (
-   `a` int(11) DEFAULT NULL,
-   `b` int(11) DEFAULT NULL
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=PBXT DEFAULT CHARSET=latin1
- 
- ** SHOW CREATE TABLE will fail if there is no grants at all: 
- show create table mysqltest_db1.t_no_priv;
-@@ -88,14 +88,14 @@
- ** SELECT FROM INFORMATION_SCHEMA.STATISTICS will succeed because any privileges will do (authentication is enough).
- 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		
-+def	mysqltest_db1	t5	1	mysqltest_db1	i	1	s1	A	0	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'
- ** SHOW INDEX FROM t6 will succeed because there exist a privilege on a column combination on t6.
- SHOW INDEX FROM t6;
- Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
--t6	1	i	1	s1	A	NULL	NULL	NULL	YES	BTREE		
-+t6	1	i	1	s1	A	0	NULL	NULL	YES	BTREE		
- ** CHECK TABLE requires any privilege on any column combination and should succeed for t6:
- CHECK TABLE t6;
- Table	Op	Msg_type	Msg_text

storage/pbxt/mysql-test/main/r/group_by.rdiff

---- r/group_by.result	2012-01-09 18:23:50.000000000 +0100
-+++ r/group_by.reject	2012-02-10 16:04:50.000000000 +0100
-@@ -270,13 +270,13 @@
- userid	count(*)
- explain select spid,count(*) from t1 where spid between 1 and 2 group by spid desc;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	range	spID	spID	5	NULL	3	Using where; Using index
-+1	SIMPLE	t1	range	spID	spID	5	NULL	1	Using where; Using index
- explain select spid,count(*) from t1 where spid between 1 and 2 group by spid;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	range	spID	spID	5	NULL	3	Using where; Using index
-+1	SIMPLE	t1	range	spID	spID	5	NULL	1	Using where; Using index
- explain select spid,count(*) from t1 where spid between 1 and 2 group by spid order by null;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	range	spID	spID	5	NULL	3	Using where; Using index
-+1	SIMPLE	t1	range	spID	spID	5	NULL	1	Using where; Using index
- select spid,count(*) from t1 where spid between 1 and 2 group by spid;
- spid	count(*)
- 1	1
-@@ -700,7 +700,7 @@
- delete from t2  where a = 2 and b = 'val-2' order by a,b,c,d limit 30;
- explain select c from t2 where a = 2 and b = 'val-2' group by c;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t2	ref	PRIMARY,a	PRIMARY	402	const,const	6	Using where
-+1	SIMPLE	t2	ref	PRIMARY,a	PRIMARY	402	const,const	1	Using where
- select c from t2 where a = 2 and b = 'val-2' group by c;
- c
- val-74
-@@ -1329,7 +1329,7 @@
- 1	SIMPLE	t1	range	PRIMARY,i2	PRIMARY	4	NULL	1	Using where; Using index
- EXPLAIN SELECT a FROM t1 WHERE a < 2 GROUP BY a;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	range	PRIMARY,i2	PRIMARY	4	NULL	1	Using where; Using index
-+1	SIMPLE	t1	range	PRIMARY,i2	PRIMARY	4	NULL	1	Using where; Using index for group-by
- EXPLAIN SELECT a FROM t1 IGNORE INDEX (PRIMARY,i2);
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
- 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	144	
-@@ -1566,7 +1566,8 @@
- (SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2));
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
- 1	PRIMARY	t2	index	a	a	5	NULL	4	Using index
--1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	144	Using where; FirstMatch(t2)
-+1	PRIMARY	<subquery2>	eq_ref	distinct_key	distinct_key	4	func	1	
-+2	MATERIALIZED	t1	ALL	NULL	NULL	NULL	NULL	144	
- SET optimizer_switch=@save_optimizer_switch;
- DROP TABLE t1, t2;
- CREATE TABLE t1(
-@@ -1904,8 +1905,8 @@
- FROM t1 GROUP BY a;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
- 1	PRIMARY	t1	index	NULL	a	10	NULL	9	Using index
--3	DEPENDENT SUBQUERY	t12	ref	a	a	10	func,func	2	Using index condition
--2	DEPENDENT SUBQUERY	t11	ref	a	a	10	func,func	2	Using index condition
-+3	DEPENDENT SUBQUERY	t12	ref	a	a	10	func,func	1	Using where
-+2	DEPENDENT SUBQUERY	t11	ref	a	a	10	func,func	1	Using where
- SELECT a, AVG(t1.b),
- (SELECT t11.c FROM t1 t11 WHERE t11.a = t1.a AND t11.b = AVG(t1.b)) AS t11c,
- (SELECT t12.c FROM t1 t12 WHERE t12.a = t1.a AND t12.b = AVG(t1.b)) AS t12c

storage/pbxt/mysql-test/main/r/heap.rdiff

---- r/heap.result	2012-01-09 16:13:21.000000000 +0100
-+++ r/heap.reject	2012-02-10 16:05:04.000000000 +0100
-@@ -664,7 +664,7 @@
- length(v)
- 65530
- drop table t1;
--set storage_engine=MyISAM;
-+set storage_engine=PBXT;
- create table t1 (a bigint unsigned auto_increment primary key, b int,
- key (b, a)) engine=heap;
- insert t1 (b) values (1),(1),(1),(1),(1),(1),(1),(1);

storage/pbxt/mysql-test/main/r/insert_select.rdiff

---- r/insert_select.result	2012-02-10 16:44:10.000000000 +0100
-+++ r/insert_select.reject	2012-02-10 16:44:35.000000000 +0100
-@@ -566,7 +566,6 @@
- a	b
- 1	t1:1
- 3	t1:3
--2	t2:2
- replace into t1 select * from t2;
- select * from t1;
- a	b

storage/pbxt/mysql-test/main/r/join_optimizer.rdiff

---- r/join_optimizer.result	2011-11-23 21:52:20.000000000 +0100
-+++ r/join_optimizer.reject	2012-02-10 16:07:08.000000000 +0100
-@@ -33,5 +33,5 @@
- WHERE g.domain = 'queue' AND g.type = a.type;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
- 1	SIMPLE	a	ALL	NULL	NULL	NULL	NULL	2	Using where
--1	SIMPLE	g	ref	groups_dt	groups_dt	70	const,test.a.type	13	Using index condition
-+1	SIMPLE	g	ref	groups_dt	groups_dt	70	const,test.a.type	1	Using where
- drop table t0,t1,t2,t3;