problem was that ha_partition::records was not implemented, thus
using the default handler::records, which is not correct if the engine
does not support HA_STATS_RECORDS_IS_EXACT.
Solution was to implement ha_partition::records as a wrapper around
the underlying partitions records.

The rows column in explain partitions will now include the total
number of records in the partitioned table.

(recommit after removing out-commented code)

 - moved the test into a separate file to check for presence of the test variable

mysql-test/r/subselect.result:
  Bug#37627: moved the test to a separate file
mysql-test/r/subselect_debug.result:
  Bug#37627: moved the test to a separate file
mysql-test/t/subselect.test:
  Bug#37627: moved the test to a separate file
mysql-test/t/subselect_debug.test:
  Bug#37627: moved the test to a separate file

	to use ANSI_QUOTES

Make all have_* tests universally safe by using ANSI quotes.

When there is an error executing EXISTS predicates they return NULL as their string
or decimal value but don't set the NULL value flag.
Fixed by returning 0 (as a decimal or a string) on error exectuting the subquery.
Note that we can't return NULL as EXISTS is not supposed to return NULL.

mysql-test/r/subselect.result:
  Bug#37627: test case
mysql-test/t/subselect.test:
  Bug#37627: test case
sql/item_subselect.cc:
  Bug#37627: return decimal (or string) 0 isntead of a NULL pointer on
  error calculating an EXISTS predicate.

Bug#12093 "SP not found on second PS execution if another thread 
drops other SP in between" and
Bug#21294 "executing a prepared statement that executes a stored 
function which was recreat"

Stored functions are resolved at prepared statement prepare only.
If someone flushes the stored functions cache between prepare and
execute, execution fails.

The fix is to detect the situation of the cache flush and automatically
reprepare the prepared statement after it.

mysql-test/r/ps_ddl.result:
  Update results (Bug#12093 and Bug#21294, the test cases are already
  in the source tree).
mysql-test/r/ps_ddl1.result:
  Update results (Bug#12093 and Bug#21294, the test cases are already
  in the source tree).
mysql-test/r/sp-error.result:
  Update results (Bug#12093 and Bug#21294, the test cases are already
  in the source tree).
mysql-test/t/ps_ddl.test:
  Modify the test to not expect an error where there is no error
  any more (Bug#12093, Bug#21294).
mysql-test/t/ps_ddl1.test:
  Modify the test to not expect an error where there is no error
  any more (Bug#12093, Bug#21294).
mysql-test/t/sp-error.test:
  Modify the test to not expect an error where there is no error
  any more (Bug#12093, Bug#21294).
sql/sp_cache.cc:
  Implement sp_cache_version() -- returns the current version of 
  a stored routines cache.
sql/sp_cache.h:
  Declare sp_cache_version().
sql/sql_prepare.cc:
  Keep track of stored functions cache version, and invalidate
  the statement if it changed between prepared statement
  prepare and execute (and the statement actually uses stored routines).

This bug has been fixed in two slightly different ways in
6.0-rpl and {5.1,6.0}-bugteam. To avoid future merge
problems, I'm now copying the 6.0-rpl fix to 5.1-bugteam.

The previous fix for the bug was incomplete. The test failed
because t2 did not exist on the slave (since the slave was
lagging) when the
wait_condition was executed. Fixed by inserting
sync_slave_with_master just after t2 was created.

Test was failing due to the addition of a '\x05' character in result sets
Latest builds of the server have shown this problem to have disappeared.
Removing code within the test that disables the test on Mac OS X.

Recommit due to tree error on earlier, approved patch.

REORGANIZE TEST parts WHERE ENGINE='NDB' ;)

Updated tests for better matching NDB's limitations.

Removed some duplicate tests.

mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added variable for NDB (since it does not support
  DROP PARTITION)
mysql-test/suite/parts/inc/partition_alter_11.inc:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Assigning directly to variable without going
  through the server.
mysql-test/suite/parts/inc/partition_bigint.inc:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added --sorted_result for consistency
  lowered number of partitions for use with NDB
  (NDB can only do maximum of 8 partitions)
mysql-test/suite/parts/inc/partition_int.inc:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added --sorted_result for consistency
  lowered number of partitions for use with NDB
  (NDB can only do maximum of 8 partitions)
mysql-test/suite/parts/inc/partition_mediumint.inc:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added --sorted_result for consistency
  lowered number of partitions for use with NDB
  (NDB can only do maximum of 8 partitions)
mysql-test/suite/parts/inc/partition_smallint.inc:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added --sorted_result for consistency
  lowered number of partitions for use with NDB
  (NDB can only do maximum of 8 partitions)
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Made it work better with NDB
mysql-test/suite/parts/inc/partition_tinyint.inc:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added --sorted_result for consistency
  lowered number of partitions for use with NDB
  (NDB can only do maximum of 8 partitions)
mysql-test/suite/parts/r/ndb_blob_partition.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removing this duplicate test since it already
  exists (and updated) in suite/ndb
mysql-test/suite/parts/r/ndb_dd_backuprestore.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Updated result file
mysql-test/suite/parts/r/ndb_partition_error.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removing this duplicate test since it already
  exists (and updated) in suite/ndb
mysql-test/suite/parts/r/ndb_partition_key.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removing this duplicate test since it already
  exists (and updated) in suite/ndb
mysql-test/suite/parts/r/ndb_partition_list.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removing this duplicate test since it already
  exists (and updated) in suite/ndb
mysql-test/suite/parts/r/ndb_partition_range.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removing this duplicate test since it already
  exists (and updated) in suite/ndb
mysql-test/suite/parts/r/part_supported_sql_func_ndb.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Updated result file
mysql-test/suite/parts/r/partition_alter1_1_innodb.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Updated result file
mysql-test/suite/parts/r/partition_alter1_1_myisam.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Updated result file
mysql-test/suite/parts/r/partition_alter1_2_innodb.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Updated result file.
  Diff bigger than necessary, due to bzr diff bug.
mysql-test/suite/parts/r/partition_alter1_2_myisam.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Updated result file
mysql-test/suite/parts/r/partition_alter2_innodb.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Updated result file
mysql-test/suite/parts/r/partition_alter2_myisam.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Updated result file
mysql-test/suite/parts/r/partition_engine_ndb.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Updated result file
mysql-test/suite/parts/r/partition_int_innodb.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Updated result file
mysql-test/suite/parts/r/partition_int_myisam.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Updated result file
mysql-test/suite/parts/r/partition_int_ndb.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Updated result file
mysql-test/suite/parts/r/rpl_ndb_dd_partitions.result:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removing this duplicate test since it already
  exists (and updated) in suite/rpl_ndb
mysql-test/suite/parts/t/disabled.def:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removed some duplicate tests, fixed some tests.
  Removed the 'runs too long on PB' test from
  disabled.def and made them to require 'big-test'.
mysql-test/suite/parts/t/ndb_blob_partition.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removing this duplicate test since it already
  exists (and updated) in suite/ndb
mysql-test/suite/parts/t/ndb_dd_backuprestore.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added new=on for allowing test of
  hash/range and list partitioning.
mysql-test/suite/parts/t/ndb_partition_error.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removing this duplicate test since it already
  exists (and updated) in suite/ndb
mysql-test/suite/parts/t/ndb_partition_key.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removing this duplicate test since it already
  exists (and updated) in suite/ndb
mysql-test/suite/parts/t/ndb_partition_list.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removing this duplicate test since it already
  exists (and updated) in suite/ndb
mysql-test/suite/parts/t/ndb_partition_range.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removing this duplicate test since it already
  exists (and updated) in suite/ndb
mysql-test/suite/parts/t/part_supported_sql_func_ndb.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added new=on for allowing test of
  hash/range and list partitioning.
  Added ndb restriction variables.
mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  requiring big-test instead of disable it.
mysql-test/suite/parts/t/partition_alter1_1_ndb.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  requiring big-test instead of disable it.
mysql-test/suite/parts/t/partition_alter1_2_ndb.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  requiring big-test instead of disable it.
mysql-test/suite/parts/t/partition_alter2_ndb.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added new=on for allowing test of
  hash/range and list partitioning.
mysql-test/suite/parts/t/partition_basic_ndb.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added new=on for allowing test of
  hash/range and list partitioning.
mysql-test/suite/parts/t/partition_bit_ndb.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added new=on for allowing test of
  hash/range and list partitioning.
mysql-test/suite/parts/t/partition_engine_ndb.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added new=on for allowing test of
  hash/range and list partitioning.
mysql-test/suite/parts/t/partition_int_ndb.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added new=on for allowing test of
  hash/range and list partitioning.
mysql-test/suite/parts/t/partition_syntax_ndb.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added new=on for allowing test of
  hash/range and list partitioning.
mysql-test/suite/parts/t/partition_value_ndb.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Added new=on for allowing test of
  hash/range and list partitioning.
mysql-test/suite/parts/t/rpl_ndb_dd_partitions.test:
  Bug#36732: many disabled ndb tests in test suite parts
  
  Removing this duplicate test since it already
  exists (and updated) in suite/rpl_ndb

Problem: rpl_switch_stm_row_mixed did not wait until row events generated by
INSERT DELAYED were written to the master binlog before it synchronized slave
with master. This caused sporadic errors where these rows were missing on
slave.
Fix: wait until all rows appear on the slave.
This is a backport, applying the same to 5.1-bugteam as was previously
applied to 6.0-rpl

Differences in 5.1: include "/etc/mysql/" in include directories; no OS/2 support.

                  InnoDB table, where all selected columns
                  belong to the same unique index key, returns
                  incorrect results

Server executes some queries via QUICK_GROUP_MIN_MAX_SELECT
(MIN/MAX optimization for queries with GROUP BY or DISTINCT
clause) and that optimization implies loose index scan, so all
grouping is done by the QUICK_GROUP_MIN_MAX_SELECT::get_next
method.

The server does not set the precomputed_group_by flag for some
QUICK_GROUP_MIN_MAX_SELECT queries and duplicates grouping by
call to the end_send_group function.

Fix: when the test_if_skip_sort_order function selects loose 
index scan as a best way to satisfy an ORDER BY/GROUP BY type
of query, the precomputed_group_by flag has been set to use 
end_send/end_write functions instead of end_send_group/
end_write_group functions.


mysql-test/r/group_min_max_innodb.result:
  Fixed bug #36632: SELECT DISTINCT from a simple view on an
                    InnoDB table, where all selected columns
                    belong to the same unique index key, returns
                    incorrect results
mysql-test/t/group_min_max_innodb.test:
  Fixed bug #36632: SELECT DISTINCT from a simple view on an
                    InnoDB table, where all selected columns
                    belong to the same unique index key, returns
                    incorrect results
sql/sql_select.cc:
  Fixed bug #36632: SELECT DISTINCT from a simple view on an
                    InnoDB table, where all selected columns
                    belong to the same unique index key, returns
                    incorrect results

      
Bug#35658 (An empty binary value leads to mysqld crash)
        
Before this fix, the following token
  b''
caused the parser to crash when reading the binary value from the empty string.
The crash was caused by:
  ptr+= max_length - 1;
because max_length is unsigned and was 0, causing an overflow.
        
With this fix, an empty binary literal b'' is parsed as a binary value 0,
in Item_bin_string.

mysql-test/r/varbinary.result:
  Bug#35658 (An empty binary value leads to mysqld crash)
mysql-test/t/varbinary.test:
  Bug#35658 (An empty binary value leads to mysqld crash)
sql/item.cc:
  Bug#35658 (An empty binary value leads to mysqld crash)

Bug#35658 (An empty binary value leads to mysqld crash)
  
Before this fix, the following token
  b''
caused the parser to crash when reading the binary value from the empty string.
The crash was caused by:
  ptr+= max_length - 1;
because max_length is unsigned and was 0, causing an overflow.
  
With this fix, an empty binary literal b'' is parsed as a binary value 0,
in Item_bin_string.

mysql-test/r/varbinary.result:
  Bug#35658 (An empty binary value leads to mysqld crash)
mysql-test/t/varbinary.test:
  Bug#35658 (An empty binary value leads to mysqld crash)
sql/item.cc:
  Bug#35658 (An empty binary value leads to mysqld crash)

Bug#37492 timing bug in subselect.test
+ similar weaknesses found during testing
+ replace error numbers by error names

Normalize directory names before adding them to default_directories.


mysys/default.c:
  Normalize directory names with unpack_dirname() before adding them
  to default_directories.  This way, /etc/ and /etc will not count as
  duplicates.
  
  Because this entails allocating memory to store the normalized names,
  add error handling and ensure that it doesn't leak memory in case
  both my_print_defaults() and load_defaults() are called.
  
  Clean up the Windows code that finds the exe's parent directory, and
  pull it out into a separate function.
  
  Reorganize the code into a single init_default_directories() function,
  with internal #ifdefs, instead of init_default_directories_<system>()
  functions which were accessed via a function pointer.  This is more in
  line with normal MySQL coding style, and easier to read for some.

Bug#35480: BOM detection code crashes mysql CLI with zero-sized input
      
MySQL client crashed if no input was passed to it.

Bug#33812: mysql client incorrectly parsing DELIMITER
      
Remove unnecessary and incorrect code that tried
to pull delimiter commands out of the middle of
statements.

            as a commentary

mysql client has been modified to interpret EOL after
standalone -- commentary strings like whitespace
character (according to
http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html)


mysql-test/t/mysql_delimiter.sql:
  Added test case for bug #36244.

configure.in:
  auto-merge
mysql-test/suite/bugs/r/rpl_bug33029.result:
  auto-merge
mysql-test/suite/bugs/t/rpl_bug33029.test:
  auto-merge
sql/slave.cc:
  auto-merge
sql/sql_class.cc:
  auto-merge
sql/structs.h:
  auto-merge

Remove unnecessary and incorrect code that tried
to pull delimiter commands out of the middle of
statements.

client/mysql.cc:
  Remove unnecessary and incorrect code that tried
  to pull delimiter commands out of the middle of
  statements.
mysql-test/r/mysql.result:
  show we no longer parse DELIMITER when
  we shouldn't.
mysql-test/t/mysql_delimiter.sql:
  show we no longer parse DELIMITER when
  we shouldn't.