Fix out of order system variable.


sql/set_var.cc:
  Fix out of order system variable.

  Put options in standard order: help first, then lexically,
  then variables.


client/mysqlbinlog.cc:
  Put options in standard order: help first, then lexically,
  then variables.

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

sql/sql_class.cc:
  Needed to be able to compile without RBR

into  mysql.com:/usr/local/mysql/mysql-5.1-new

parent when we are not the process group leader.

the bug is fixed.


mysql-test/t/rpl_row_sp000.test:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
mysql-test/r/rpl_row_sp000.result:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
mysql-test/r/rpl_stm_sp.result:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
mysql-test/t/rpl_stm_sp.test:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.

into  mysql.com:/home/bkroot/mysql-5.1-new

into  mysql.com:/home/bk/b15924-mysql-5.1-new

into  mysql.com:/home/bk/b15924-mysql-5.1-new


sql/sql_class.cc:
  Auto merged
mysql-test/t/disabled.def:
  Merge with mysql-5.1-new

into  mysql.com:/home/bk/b15942-mysql-5.1-new


sql/handler.cc:
  Auto merged

into  mysql.com:/usr/local/mysql/mysql-5.1-new


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

mysql-test/t/disabled.def:
  BUG#16167: Disable test case until bug is fixed.

into mysql.com:/M51/mysql-5.1

head_sptr array was wrong.

into  mysql.com:/home/bkroot/mysql-5.1-new

the mysqlslap lock directory to value of --tmpdir.


mysql-test/mysql-test-run.pl:
  Set mysqlslap --lock-directory to avoid conflicts between parallel tests.

  Test passes. Bug was probably fixed in the implementation of WL#2867.


mysql-test/t/rpl_sp_effects.test:
  Removed check for statement-based replication.

apparently lost in merge.


client/mysqlslap.c:
  Fix compile failure.

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

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


client/mysqlslap.c:
  Merge of comments change

Cleaned up memory allocation to be a little more staight forward (though I suspect someone will hate my sizeof() increment). 
Nothing really to see here. Updated comments in code.

More comments are probably needed, but isn't that always the case?


client/mysqlslap.c:
  Updated docs. 
  Removed complicated malloc calls with a single malloc. Cleaned up the way statements were be free'd (aka its now a function instead of a bunch of copy/paste).
  Removed older and not so accurate timediff() call. Cleaned up call to parse out concurrency.
mysql-test/t/mysqlslap.test:
  Edited the tests to make sure we check default concurrency (we can't test concurrency normally since in theory the results could be random).
  You will noticed that the result was not changed.

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


client/mysqlslap.c:
  Resolve conflict

Now does averaging when running iterations. 
Realligned a bunch of code and continued to remove global variables.
Added CSV output along with printable.
Structures are now provided for print options so adding XML, HTML, ... should now be trivial.


client/client_priv.h:
  Simplified options
client/mysqlslap.c:
  Giant cleanup.
  We now do single pass testing, not dual pass. The dual pass made no sense really especially when you started adding in more stats.
  Modified the testing loop so that it should not be possible to have both a fork() and thread version (which will make it easier to port to windows should someone want to).
mysql-test/r/mysqlslap.result:
  New results
mysql-test/t/mysqlslap.test:
  Adjusting for new options, and removed "archive" from the tests just in case archive is not compiled.

into  mysql.com:/usr/local/mysql/mysql-5.1-new

sql/sql_plugin.cc:
  Can't initialize char * from const char *, so add cast.

caused wrong permissions in "make dist".


mysql-test/Makefile.am:
  *.sh files must use INSTALL_SCRIPT, not INSTALL_DATA.

include/my_bitmap.h:
  Protect incluce of my_pthread.h with #ifdef THREAD, to make it work in non-thread environment.
sql/rpl_tblmap.h:
  Remove unused NO_TABLE enum which broke compilation on picky compilers (trying to put ULONG_MAX into an int...)

into  mysql.com:/export/space/pekka/ndb/version/my51

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  set non-update pk pre data to UNDEFINED (previously unspecified)
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  fix detached trigger opType
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  fix detached trigger opType
storage/ndb/test/ndbapi/test_event_merge.cpp:
  exact verif post/pre data

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

MYSQL_STORAGE_ENGINE macro (and nowhere else)

  which makes it possible to run RENAME TABLE
  on old tables when upgrading from 5.0.
  TODO: A stored procedure to rename all tables and
  databases with old name format into new format,
  it will simplify upgrade.
sql_table.cc:
  Making old tables seen with "#mysql50#" prefix.
  Adding warning into .err log when an old name is found.
sql_show.cc:
  Skip non-directories before filename_to_tablename
  call, to avoid unnecessary warnings.
strfunc.cc:
  Adding "error" argument to strconvert()
mysql_priv.h:
  Adding "error" agrument to strconvert()


sql/mysql_priv.h:
  Adding "error" agrument to strconvert()
sql/strfunc.cc:
  Adding "error" argument to strconvert()
sql/sql_show.cc:
  Skip non-directories before filename_to_tablename
  call, to avoid warning.
sql/sql_table.cc:
  Making old tables seen with "#mysql50#" prefix,
  which makes it possible to run RENAME TABLE
  on old tables.
  Adding warning into .err log when an old name is found.

into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs3


sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged