into  gbichot4.local:/home/mysql_src/mysql-maria-monty

tarball, so that those tests are run on all platforms.

into  hynda.mysql.fi:/home/my/mysql-maria

storage/maria/ma_test_recovery:
  Made the shell version empty to avoid modifying
  files in two places. Linked to the current one.
storage/maria/unittest/ma_test_recovery.pl:
  New version of ma_test_recovery.pl
  Added --help and --version, made a function
  of the main part, removed all calls to unix
  mv and cp

Solaris 10 Sparc 64bit.


include/my_atomic.h:
  Prototypes in the non-inline (extern) case were wrong: they were
  missing "U_a" i.e. "volatile *". Caused a segfault in my_atomic-t
  on Solaris10 Sparc 64.
storage/maria/ma_loghandler.c:
  Move "buffer" array up in the struct, to get it aligned on long-boundary
  so that page cache can use bmove512() (it was not aligned and bmove512()
  was used, causing SIGBUS on Solaris10 Sparc 64).
storage/maria/unittest/ma_pagecache_consist.c:
  doing *(uint*)(charbuff)=something is not ok on sparc machines, we must
  use int4store/uint4korr. Fixes a SIGBUS on Solaris10 Sparc 64.

  Adjust to match storage engine API, 'mysql_var_update_func' function
  prototype changed so that last argument now "void *save" with "const"


storage/maria/ha_maria.cc:
  Adjust to match storage engine API, 'mysql_var_update_func' function
  prototype changed so that last argument now "void *save" with "const"

into  mysql.com:/data0/mysqldev/my/build-200802121236-5.1.23a-maria-alpha/mysql-5.1-release

into  xiphis.org:/anubis/antony/work/p1-bug34598.2.merge.maria


include/mysql/plugin.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged

  "crash on hpita: Invalid address alignment"
  Replace dangerous pointer arithmetic - it may occurr where sizeof(int) is
  less than size of machine alignment requirement.


include/mysql/plugin.h:
  bug34598
    change of update func prototype
sql/sql_plugin.cc:
  bug34598
    Avoid dangerous pointer arithmetic which can cause unaligned word access.
    Change of update function prototype

libmysql/get_password.c:
  fix for build failure (no bool in C)

until Windows team confers.


client/get_password.c:
  fix for build failure (HPUX etc): no bool in C
dbug/dbug.c:
  typo
include/config-win.h:
  putting back the infamous #define, because without it we have 650
  distinct compiler warnings "forcing value to bool 'true' or 'false'"
  (C4800), Windows team will confer on what to do.
include/thr_alarm.h:
  fix for build failure on Windows
libmysql/dll.c:
  fix for build failure on Windows
mysys/thr_alarm.c:
  fix for build failure on HPUX

  SCCS merged


dbug/dbug.c:
  SCCS merged

dbug/dbug.c:
  importing change from 6.0, which speeds up --debug on Windows (no sync)
storage/maria/unittest/ma_test_loghandler-t.c:
  this test needs ~80 open files (logs)

into  mysql.com:/home/kent/bk/maria/mysql-5.1-maria-alpha-release

Removing "#define bool BOOL" as it's dangerous.


include/config-win.h:
  This #define was confusing: a) it changes the semantics of bool but
  only on Windows (C++ standard says that casting int to bool to int
  yields 0 or 1, but if using BOOL (which is int) this breaks, see
  old BUG 11567 "Variable 'foreign_key_checks', and other variables,
  differs binlog tests") b) it is not needed in C++ which has a bool type
  c) it is not needed in C where we must use my_bool as bool either does
  not exist or changes size between C and C++.
storage/maria/ma_check.c:
  my_bool for C
storage/maria/ma_dynrec.c:
  my_bool for C
storage/maria/ma_search.c:
  my_bool for C
storage/maria/ma_write.c:
  my_bool for C
storage/maria/maria_def.h:
  my_bool for C
storage/maria/maria_pack.c:
  my_bool for C

into  gbichot4.local:/home/mysql_src/mysql-maria-monty


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/replace.c:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
include/my_global.h:
  merge
storage/myisam/myisamdef.h:
  merge

value" error even though the value was correct): a C function in my_getopt.c
was taking bool* in parameter and was called from C++ sql_plugin.cc,
but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny
mismatches. Fixed, all other occurences of bool in C are removed, future
ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool).


client/mysqldump.c:
  my_bool for C
client/mysqltest.c:
  my_bool for C
extra/replace.c:
  my_bool for C
include/my_getopt.h:
  my_bool for C
include/my_global.h:
  Prevent people from using bool in C, it causes real bugs.
include/my_sys.h:
  my_bool for C
include/my_time.h:
  my_bool for C
include/thr_lock.h:
  my_bool for C
libmysql/libmysql.c:
  my_bool for C
mysys/charset.c:
  my_bool for C
mysys/my_getopt.c:
  my_bool for C
mysys/queues.c:
  my_bool for C
mysys/thr_lock.c:
  my_bool for C
regex/reginit.c:
  my_bool for C
sql/set_var.cc:
  C functions use my_bool so we must use my_bool too.
sql/sql_plugin.cc:
  C functions use my_bool so we must use my_bool too.
  This fixes a real observed bug of Maria, because on some Mac OS X,
  sizeof(bool) is 1 in C and 4 in C++, so the bool* does wrong.
  Removing useless line.
storage/heap/hp_update.c:
  my_bool for C
storage/myisam/mi_check.c:
  my_bool for C
storage/myisam/mi_dynrec.c:
  my_bool for C
storage/myisam/mi_search.c:
  my_bool for C
storage/myisam/mi_update.c:
  my_bool for C
storage/myisam/mi_write.c:
  my_bool for C
storage/myisam/myisamdef.h:
  my_bool for C
storage/myisam/myisamlog.c:
  my_bool for C
storage/myisam/myisampack.c:
  my_bool for C
tests/mysql_client_test.c:
  my_bool for C
unittest/mysys/bitmap-t.c:
  my_bool for C
vio/viosslfactories.c:
  my_bool for C

into  mysql.com:/home/kent/bk/maria/mysql-5.1-maria-alpha-release

into  mysql.com:/home/kent/bk/maria/mysql-5.1-maria-alpha-release


libmysqld/CMakeLists.txt:
  Auto merged

  Missing "sql_profile.cc" was added


libmysqld/CMakeLists.txt:
  Missing "sql_profile.cc" was added

mysql-test/r/maria.result:
  result update
mysql-test/t/maria.test:
  The embedded server translates INSERT DELAYED to plain INSERT
  so does not produce an error; moving this test to a new test
  which is not run for the embedded server.
mysql-test/r/maria_notembedded.result:
  result is ok
mysql-test/t/maria_notembedded.test:
  New test for cases where embedded server is different.

into  mysql.com:/data0/mysqldev/my/build-200802121236-5.1.23a-maria-alpha/mysql-5.1-release

into  mysql.com:/data0/mysqldev/my/build-200802121236-5.1.23a-maria-alpha/mysql-5.1-release

into  mysql.com:/home/my/mysql-maria

include/my_dbug.h:
  warnings

into  mysql.com:/home/my/mysql-maria

Added IMPOSSIBLE_RESULT to avoid compiler warnings when using (Item_result) -1 as a dummy value
Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined


client/get_password.c:
  Fixed compiler warning
cmd-line-utils/readline/bind.c:
  Fixed compiler warning
cmd-line-utils/readline/chardefs.h:
  Fixed compiler warning by adding marco to be used when largest_char is 255
cmd-line-utils/readline/display.c:
  Fixed compiler warnings by removing not accessed variables
cmd-line-utils/readline/histexpand.c:
  Fixed compiler warnings by removing not accessed variables
cmd-line-utils/readline/history.c:
  Fixed compiler warnings by adding cast
cmd-line-utils/readline/text.c:
  Fixed compiler warnings by removing not accessed variables and adding casts
dbug/dbug.c:
  Fixed compiler warnings by changing types
include/mysql_com.h:
  Added IMPOSSIBLE_RESULT to avoid compiler warnings when using (Item_result) -1 as a dummy value
libmysql/libmysql.c:
  Fixed compiler warning
mysql-test/t/query_cache_debug.test:
  Mark test as BIG as it uses a lot of memory
mysys/mf_iocache2.c:
  Fixed compiler warnings by adding cast
sql/event_data_objects.cc:
  Fixed compiler warnings by removing not used code
sql/events.cc:
  Fixed compiler warnings by removing not used code
sql/field.cc:
  Fixed compiler warnings by adding cast and removed not accessed variables
sql/ha_partition.cc:
  Fixed compiler warnings by removing not used code
sql/item.cc:
  Fixed compiler warnings by removing not accessed variables
  Use IMPOSSIBLE_RESULT instead of (Item_result)-1
sql/item_cmpfunc.cc:
  Fixed compiler warnings by removing not accessed variables
sql/item_func.cc:
  Fixed compiler warnings by removing not used code and not accessed variables
  Added IMPOSSIBLE_RESULT
sql/item_subselect.cc:
  Fixed compiler warnings by removing not accessed variables
sql/item_xmlfunc.cc:
  Fixed forgotten setting of xpath->error
sql/log.cc:
  Fixed compiler warnings by removing not accessed variables
sql/log_event.cc:
  Added IMPOSSIBLE_RESULT into switch
  Fixed wrong usage of DBUG_ASSERT(1)
  Removed always true DBUG_ASSERT()
sql/mysqld.cc:
  Fixed compiler warnings by adding casts for ULONG_MAX
sql/opt_sum.cc:
  Fixed compiler warnings by removing not used code
  Removed wrong DBUG_ASSERT()
sql/partition_info.cc:
  Fixed compiler warnings by removing not accessed variables
sql/rpl_injector.h:
  Removed always true part from DBUG_ASSERT() to remove compiler warning
sql/spatial.cc:
  Fixed compiler warnings by removing not accessed variables
sql/sql_acl.cc:
  Fixed compiler warnings by removing not accessed variables
sql/sql_base.cc:
  Fixed compiler warnings by removing not accessed variables
sql/sql_cache.cc:
  Fixed compiler warnings by removing not accessed variables
sql/sql_class.cc:
  Fixed compiler warnings by:
  - Removing always true part from DBUG_ASSERT()
  - Removing not used code
  - Added IMPOSSIBLE_RESULT into switch
sql/sql_load.cc:
  Fixed compiler warnings by removing not accessed variables
sql/sql_parse.cc:
  Fixed compiler warnings by:
  - Removing not accessed variables
  - Removing always true part from DBUG_ASSERT()
  - Removing not used code
sql/sql_plugin.cc:
  Added comment
sql/sql_prepare.cc:
  Fixed compiler warnings by removing not accessed variables
sql/sql_show.cc:
  Fixed compiler warnings by using correct cast
sql/sql_table.cc:
  Fixed compiler warnings by removing not used code and removing not accessed variables
sql/table.cc:
  Fixed compiler warnings by removing not accessed variables
sql/time.cc:
  Fixed wrong DBUG_ASSERT(1)
storage/maria/unittest/Makefile.am:
  Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined
storage/maria/unittest/ma_pagecache_consist.c:
  Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined
storage/maria/unittest/ma_pagecache_single.c:
  Changed PAGE_SIZE to TEST_PAGE_SIZE to avoid compiler errors on systems where PAGE_SIZE is defined
tests/mysql_client_test.c:
  Fixed compiler warnings by removing not accessed variables and changing types

include/atomic/rwlock.h:
  define MY_ATOMIC_MODE_RWLOCKS if this is the way we have to go
mysys/lf_alloc-pin.c:
  no semicolon
mysys/lf_hash.c:
  no semicolon
storage/maria/lockman.c:
  no semicolon
storage/maria/ma_loghandler.c:
  no semicolon
unittest/mysys/my_atomic-t.c:
  powerpc is no better
  (condition could be a bit too broad, but hey, it's just a unit test)

into  mysql.com:/home/kent/bk/maria/mysql-5.1-maria-alpha-release

  If the third number in version is followed by a letter, include it
  in NDB_VERSION_STATUS, but not in numeric NDB_VERSION_BUILD


config/ac-macros/ha_ndbcluster.m4:
  If the third number in version is followed by a letter, include it
  in NDB_VERSION_STATUS, but not in numeric NDB_VERSION_BUILD

  Set version to 5.1.23a-maria-alpha


configure.in:
  Set version to 5.1.23a-maria-alpha

into  oleksandr-byelkins-powerbook-g4-15.local:/Users/bell/mysql/bk/mysql-maria

storage/maria/ma_loghandler.c:
  Fixed comparison of signed and unsigned.

into  gbichot4.local:/home/mysql_src/mysql-maria-monty

into  mysql.com:/home/my/mysql-maria

into  mysql.com:/home/my/mysql-maria