into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_func.cc:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
sql/mysqld.cc:
  Manual merge

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_servers.h:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
sql/sql_servers.cc:
  Manual merge

sql/stacktrace.c:
  removed code duplication
sql/stacktrace.h:
  removed code duplication

into  chilla.local:/home/mydev/mysql-5.0-axmrg


myisam/mi_range.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
mysql-test/r/myisam.result:
  Manual merge from 4.1
mysql-test/t/heap_btree.test:
  Manual merge from 4.1

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-4.1-axmrg

into  chilla.local:/home/mydev/mysql-4.1-axmrg

into  chilla.local:/home/mydev/mysql-4.1-axmrg


sql/ha_myisam.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-4.1-axmrg

into  chilla.local:/home/mydev/mysql-4.1-bug24985


mysql-test/r/heap_btree.result:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge

into  chilla.local:/home/mydev/mysql-5.0-bug24985


sql/ha_myisam.cc:
  Auto merged
mysql-test/r/heap_btree.result:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


mysql-test/mysql-test-run.pl:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

into  chilla.local:/home/mydev/mysql-5.1-bug24985


storage/myisam/ha_myisam.cc:
  Auto merged
mysql-test/r/heap_btree.result:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge from 5.0
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge from 5.0

into  chilla.local:/home/mydev/mysql-5.1-bug24985


mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged

            causes incorrect duplicate entries
After merge fix

into  trift-lap.fambruehe:/MySQL/M51/push-5.1


mysql-test/t/query_cache_sql_prepare.test:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-bug24985


mysql-test/r/heap_btree.result:
  Auto merged
sql/ha_heap.cc:
  Auto merged
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge from 4.1

            causes incorrect duplicate entries

Keys for BTREE indexes on ENUM and SET columns of MEMORY tables
with character set UTF8 were computed incorrectly. Many
different column values got the same key value.

Apart of possible performance problems, it made unique indexes
of this type unusable because it rejected many different
values as duplicates.

The problem was that multibyte character detection was tried
on the internal numeric column value. Many values were not
identified as characters. Their key value became blank filled.

Thanks to Alexander Barkov and Ramil Kalimullin for the patch,
which sets the character set of ENUM and SET key segments to
the pseudo binary character set.


mysql-test/r/heap_btree.result:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Added test result.
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Added test.
sql/ha_heap.cc:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Set key segment charset to my_charset_bin for ENUM and SET
  columns.

storage/archive/ha_archive.cc:
  Adding init for HA_STATUS_AUTO call

into  zim.(none):/home/brian/mysql/pread-archive-5.1


storage/archive/ha_archive.cc:
  Auto merged

Centralized init logic for starting a scan. 


storage/archive/ha_archive.cc:
  Removed multiple execution logic

storage/archive/ha_archive.cc:
  Adjusted lock positions to handle possible concurrency condition

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/test/src/NDBT_Table.cpp:
  manual merge

    correct cit printout
    correct bit store retrieve


ndb/include/ndbapi/NdbRecAttr.hpp:
  correct medium int printout
ndb/src/ndbapi/NdbRecAttr.cpp:
  correct cit printout
sql/ha_ndbcluster.cc:
  correct bit store retrieve

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

- always store lsw first in ndb

into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028

into  zim.(none):/home/brian/mysql/slap-5.1


client/mysqlslap.c:
  Auto merged

Added pre and post option to test run (allows me to adjust an engine once all of the data has been loaded).

Kinda obvious that this was going to come up ;)


client/client_priv.h:
  New options
client/mysqlslap.c:
  Added option for pre/post run
mysql-test/r/mysqlslap.result:
  Updated tests
mysql-test/t/mysqlslap.test:
  Updated test