Change SET variables to be ulonglong type (64bit)


include/mysql/plugin.h:
  WL2936
    Change SET variables to be unsigned long long type
    Changed use of ulonglong to unsigned long long
sql/sql_plugin.cc:
  WL2936
    Change SET variables to be ulonglong type (64bit)

scripts/mysql_install_db.sh: don't fail if --skip-XXX is not recognized


mysql-test/mysql-test-run.pl:
  another mysqld --help fix
scripts/mysql_install_db.sh:
  don't fail if --skip-XXX is not recognized

include/my_global.h:
  only use compile_time_assert on gcc
mysql-test/mysql-test-run.pl:
  better --datadir for mysqld --help
sql/mysql_priv.h:
  error-prone but concatenation-friendly IF_NETWARE()
storage/innobase/handler/ha_innodb.cc:
  no preprocessor directives inside macro arguments

sql/sql_lex.cc:
  remove bad fix

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936


include/mysql/plugin.h:
  Auto merged

  VC++ does not like compile_time_assert() macro

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936


sql/sql_plugin.cc:
  merged

  fix compile error when DBUG_OFF


sql/sql_plugin.cc:
  fix compile error when DBUG_OFF

into  chilla.local:/home/mydev/mysql-5.1-wl2936-two


sql/sql_plugin.cc:
  Auto merged

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

Changed back (type != OPT_SESSION) to (type == OPT_GLOBAL)

into  chilla.local:/home/mydev/mysql-5.1-wl2936-two


mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged

    provide the writable datadir for mysqld --help (for lower_case test)
sql/log.h, sql/mysqld.cc
    make default binlog_format value to be 0 (for a hack of using
    GET_STR for enum to continue to work)


mysql-test/mysql-test-run.pl:
  provide the writable datadir for mysqld --help (for lower_case test)
sql/log.h:
  make default binlog_format value to be 0 (for a hack of using
  GET_STR for enum to continue to work)
sql/mysqld.cc:
  make default binlog_format value to be 0 (for a hack of using
  GET_STR for enum to continue to work)

into  chilla.local:/home/mydev/mysql-5.1-wl2936-two


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_dd_basic.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ndb_dd_basic.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/hash.c:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_connect.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/handler/ha_innodb.h:
  Auto merged
include/typelib.h:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Manual merge
mysys/typelib.c:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Manual merge

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines

Ingo's patch:
WL#2936 - Falcon & MySQL plugin interface: server variables
Added initialization for plugin string variables with their
default values.
Added deallocation of string values before a plugin and its
variables is deleted.
Added examples to plugin_example


mysys/my_getopt.c:
  Ingo's patch:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Added initialization for string options. Since string variables
  do often have their default value assigned already, assign the
  default value only if the variable value is NULL.
plugin/fulltext/plugin_example.c:
  Ingo's patch:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Added examples for thread variables, which have a SESSION and
  a GLOBAL value.
sql/mysqld.cc:
  removed second fix_paths() in --help output (memory leak).
  removed invalid string defaul values (binlog_format)
  don't hide the error message in the help text
sql/sql_plugin.cc:
  don't do plugin_dl_del for built-in plugins (sigsegv).
  Ingo's patch:
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Clearing newly allocated variable value space. This is important
  for string variables. They are initialized to their default
  value only if their initial value is NULL.
  Setting default values for strings.
  Added a function to free global value space for string variables.
  Call the function before deleting a plugin and its variables.

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


mysql-test/Makefile.am:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysql_system_tables.sql:
  Auto merged
scripts/mysql_system_tables_data.sql:
  Auto merged
sql/item_subselect.h:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testScanFilter.cpp:
  Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  No need to propagate 5.0 changes into a 5.1 file which is deleted anyway.
Makefile.am:
  Add "funcs_1" and "funcs_2" to the 5.1 version of the "test-bt" target.
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Manual merge from 5.0.40

into  trift-lap.fambruehe:/MySQL/M50/push-5.0


Makefile.am:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysql_system_tables.sql:
  Auto merged
scripts/mysql_system_tables_data.sql:
  Auto merged
sql/item_subselect.h:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Manual merge: Use the symbolic constant.
ndb/test/ndbapi/testScanFilter.cpp:
  Manual merge: Use the standard text.

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


configure.in:
  Auto merged
include/Makefile.am:
  Auto merged

into  trift-lap.fambruehe:/MySQL/M50/push-5.0

into  trift-lap.fambruehe:/MySQL/M41/push-4.1

into  trift-lap.fambruehe:/MySQL/M50/push-5.0


configure.in:
  Auto merged
include/Makefile.am:
  Auto merged

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


configure.in:
  Auto merged
include/Makefile.am:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

mysql-test/t/partition.test:
  Disable warnings around CREATE TABLE ... ENGINE=BLACKHOLE to make this test case work without Blackhole compiled into the server.
mysql-test/t/partition_hash.test:
  Disable warnings around CREATE TABLE ... ENGINE=BLACKHOLE to make this test case work without Blackhole compiled into the server.

mysql-test/t/partition_not_windows-master.opt:
  BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/t/partition_not_windows-master.opt
mysql-test/t/partition_not_windows.test:
  Tweak comments to be more meaningful

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


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

```yaml
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vanilla-building
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-vanilla-building
```

Fix test cases to pass for a plain ./configure && make build. This includes disabling two test cases when certain features are not present in the server. We're not losing coverage from this because these features are usually present, and disabling them here only serves the purpose to make the test cases work in the unlikely case that they aren't.
---
fixes


mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
  Disable this test case if we don't have partitioning
mysql-test/t/rpl_row_basic_11bugs.test:
  Disable warnings in a number of places to make this test case work with servers that don't contain InnoDB
  ---
  make test case look better on request from reviewer
mysql-test/t/rpl_row_mysqlbinlog.test:
  Disable this test case if the server does not have cp932 compiled in
mysql-test/t/sp.test:
  Disable warnings during table creation in one place where engine=innodb is used, in order to make this test case work with a mysqld that was compiled without InnoDB.

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51

mysql-test/t/sp.test:
  Disable warnings during table creation in one place where engine=innodb is used, in order to make this test case work with a mysqld that was compiled without InnoDB.

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

mysql-test/include/have_symlink.inc:
  BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/include/have_symlink.inc

  Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed


server-tools/instance-manager/thread_registry.cc:
  Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed