Fixed that --plugin_dir option doesn't work.
Fixed that parser name is not restored correctly from the table.


sql/mysqld.cc:
  Overwrite opt_plugin_dir_ptr _after_ loading the path.
sql/table.cc:
  Partition saves at least 5 bytes in .frm.

Manual merge.


Makefile.am:
  Added new 'plugin' subdir.
configure.in:
  Added plugin related makefiles.
include/my_base.h:
  Added HA_OPEN_FROM_SQL_LAYER flag - indicates that a table was openned from the sql layer.
  Added HA_OPTION_RELIES_ON_SQL_LAYER flag - indicates that a table relies on the sql layer.
  Added HA_CREATE_RELIES_ON_SQL_LAYER flag - indicates that a table must be created with
  HA_OPTION_RELIES_ON_SQL_LAYER flag.
include/myisam.h:
  Distinct fulltext parser number added.
include/plugin.h:
  Revise comment.
sql/ha_myisam.cc:
  Pass HA_OPEN_FROM_SQL_LAYER flag to mi_open().
  Pass HA_CREATE_RELIES_ON_SQL_LAYER flag to mi_create().
sql/sql_plugin.cc:
  Reuse "unused" dynamic array elements.
  A check for plugin info interface version.
sql/sql_plugin.h:
  Added plugin_type_names[] - string plugin type names.
sql/sql_show.cc:
  Use plugin_type_names array instead of switch to find literal parser name representation.
sql/sql_table.cc:
  Fixed that ALTER TABLE ... ADD INDEX loses WITH PARSER info.
storage/myisam/ft_boolean_search.c:
  Call fulltext parser init() function, pass MYSQL_FTPARSER_PARAM, returned by
  ftparser_call_initializer(), to parser->parse().
storage/myisam/ft_nlq_search.c:
  Call fulltext parser init() function, pass MYSQL_FTPARSER_PARAM, returned by
  ftparser_call_initializer(), to parser->parse().
storage/myisam/ft_parser.c:
  Added two functions:
  ftparser_call_initializer() - calls parser->init() function if specified and parser is not yet
  initialized. Returns MYSQL_FTPARSER_PARAM *.
  ftparser_call_deinitializer() - calls parser->deinit() function if specified and parser was
  initialized. Deinitializes all parsers.
  ft_parse() accepts additional param now - MYSQL_FTPARSER_PARM and passes it to parser->parse().
storage/myisam/ft_update.c:
  Call fulltext parser init() function, pass MYSQL_FTPARSER_PARAM, returned by
  ftparser_call_initializer(), to _mi_ft_parse().
  _mi_ft_parse() accepts additional param now - MYSQL_FTPARSER_PARAM and passes
  it to parser->parse().
storage/myisam/ftdefs.h:
  Prototypes for new functions were added. MYSQL_FTPARSER_PARAM was added
  to ft_parse and _mi_ft_parse().
storage/myisam/mi_close.c:
  Free ftparser_param allocated by ftparser_call_initializer().
storage/myisam/mi_create.c:
  If a table relies on the sql layer, set HA_OPTION_RELIES_ON_SQL_LAYER.
storage/myisam/mi_locking.c:
  Call deinitializer for each initialized parser.
storage/myisam/mi_open.c:
  Set default values for share->ftparser and keydef->ftparser_nr.
  If a table is openned from the non-sql layer and HA_OPTION_RELIES_ON_SQL_LAYER is set, raise
  HA_ERR_UNSUPPORTED error.
storage/myisam/myisamdef.h:
  Added number of distinct parsers to MYISAM_SHARE.
  Added ftparser_param to MI_INFO.
plugin/Makefile.am:
  New BitKeeper file ``plugin/Makefile.am''
plugin/fulltext/Makefile.am:
  New BitKeeper file ``plugin/fulltext/Makefile.am''
plugin/fulltext/plugin_example.c:
  New BitKeeper file ``plugin/fulltext/plugin_example.c''

storage/archive/azio.c:
  Build fixes for not having zutil.h
  
  use memset instead of zmemzero.
  
  use 8 as memory usage level (the default, which we were using anyway)
  
  in the .gz header, just say we're UNIX.
  
  use memcpy instead of zmemcpy.
storage/archive/azlib.h:
  don't use zutil.h, it's private to zlib

into  mysql.com:/home/stewart/Documents/MySQL/5.1/new


client/mysqltest.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
strings/decimal.c:
  Auto merged
configure.in:
  remove 5.0 version increement
sql/ha_archive.cc:
  merge
sql/handler.cc:
  merge
sql/mysqld.cc:
  merge

into  xiphis.org:/home/antony/work2/p4-bug15976

into  mysql.com:/space/pekka/ndb/version/my50

storage/ndb/test/ndbapi/test_event_merge.cpp:
  Rename: ndb/test/ndbapi/test_event_merge.cpp -> storage/ndb/test/ndbapi/test_event_merge.cpp
storage/ndb/test/ndbapi/Makefile.am:
  post-merge fix

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


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  merge-ul
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  merge-ul
storage/ndb/test/ndbapi/Makefile.am:
  merge-ul

ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  error code 4709 was set outside if()
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  fix opType for detached triggers (accidental miss since v21x?)
ndb/test/ndbapi/Makefile.am:
  test_event_merge v5.0
ndb/test/ndbapi/test_event_merge.cpp:
  test_event_merge v5.0

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  build fix for 5.0

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


client/mysql.cc:
  Auto merged
myisam/mi_delete.c:
  Auto merged
mysql-test/r/fulltext2.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.1-bug5390

into  mysql.com:/home/mydev/mysql-5.1-bug5390


sql/sql_parse.cc:
  Auto merged

                                           


sql/sql_yacc.yy:
  Fix for SQLCOM_BINLOG_BASE64_EVENT related code.                                
  - added missing ';'                                                             
  - added binlog_base64_event

into  pylon.mylan:/home/psergey/mysql-5.1-26dec-merge

into  mysql.com:/home/psergey/mysql-5.1-26dec-merge

into  pylon.mylan:/home/psergey/mysql-5.1-26dec-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/handler.h:
  Merge

into  mysql.com:/home/mydev/mysql-5.1-bug5390


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/r/create.result:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
mysql-test/r/merge.result:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
mysql-test/t/merge.test:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/mysql_priv.h:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/sql_base.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/sql_delete.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/sql_insert.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/sql_load.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/sql_parse.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1
sql/sql_update.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.1

into  mysql.com:/home/mydev/mysql-5.0-bug5390


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
mysql-test/r/create.result:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
mysql-test/r/merge.result:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
mysql-test/t/create.test:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
mysql-test/t/merge.test:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/mysql_priv.h:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/sql_parse.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/sql_update.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0

  added item_xmlfunc.cc


BitKeeper/etc/ignore:
  added item_xmlfunc.cc

  Delete: libmysqld/item_xmlfunc.cc


BitKeeper/deleted/.del-item_xmlfunc.cc~565ad32584ed96d4:
  Delete: libmysqld/item_xmlfunc.cc

adjust SEL_TREE::keys_map appropriately.

- Added more comments.
- Added a RANGE_OPT_PARAM::remove_jump_scans flag that disables construction of index_merge
  SEL_TREEs that represent unusable conditions like "key1part1<c1 OR key2part2<c2"
- make prune_partitions() function handle the case where range analysis produces a list of 
  index_merge trees (it turned out that this is possible, appropriate test case added).
- Other small fixes.


mysql-test/r/partition_pruning.result:
  WL#2985 "Partition Pruning": post-review fixes: more test cases
mysql-test/t/partition_pruning.test:
  WL#2985 "Partition Pruning": post-review fixes: more test cases
sql/opt_range.cc:
  WL#2985 "Partition Pruning": post-review fixes:
  - Added more comments.
  - Fix the debug printouts
  - Added a RANGE_OPT_PARAM::remove_jump_scans flag that disables construction of index_merge
    SEL_TREEs that represent unusable conditions like "key1part1<c1 OR key2part2<c2"
  - make prune_partitions() function handle the case where range analysis produces a list of 
    index_merge trees (it turned out that this is possible, appropriate test case added).
sql/sql_partition.cc:
  WL#2985 "Partition Pruning": post-review fixes: make requested edits in comments.
sql/table.h:
  WL#2985 "Partition Pruning": post-review fixes: added bool TABLE::no_partitions_used
  (this change was missed when making the original cset)

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


client/mysqlslap.c:
  Auto merged

BitKeeper/etc/ignore:
  added storage/archive/archive_test

  leaks caused by Archive storage engine not closing files and
  storage engines not receiving panic() during shutdown


sql/ha_archive.cc:
  surplus my_close() call not neccessary as azclose() should work
sql/mysqld.cc:
  Make sure storage engines get panic() call by moving it before plugin_free()
storage/archive/azio.c:
  typo perhaps. azio was not closing files.

--engine="myisam,archive"

--number-of-rows has been removed for the time being and replaced with
 option to allow you to just repeat multiple time all of the inserts you specifed with data. When number-of-rows-returns it will be instead used for averaging rows while growing concurrency. 

Returned stats now has accurent row and query counts since it includes a multiple for the rows and queries added.

Parser is now a touch smarter and understands end of file issues if you have a delimiter at the end of the file.  


client/client_priv.h:
  New options
client/mysqlslap.c:
  Modifications for doing repeated tests.
mysql-test/r/mysqlslap.result:
  New result file
mysql-test/t/mysqlslap.test:
  Changes in tests to make sure concurrency failures would not occur.

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


mysql-test/r/information_schema.result:
  Auto merged

1) Parsing now works
2) Options are safer, aka it doesn't kill the machine and it cleans up after itself
3) Option of --only-print added so that you can see what it does.
4) Tiny cleanup of the auto generate sql. A lot more needs to be done with this, for it to be very valuable. I suspect it doesn't work all that well.
5) Delimeter is now a single character. No good escaping going on.
6) You can now change which schema it is runninng against.

Now I think I can go make use of it! 

Though I need to add support for a "only run this many inserts, divide by the number of clients connecting, to really test scaling"



client/client_priv.h:
  Added new options for mysqlslap
client/mysqlslap.c:
  Lots of cleanup.
  
  Highlights:
  1) Parsing now works much better, though I suspect escaping issues still exist. All strings are parsed into a typedef called statement. This is a linked structure with each statement held in it. I added options for length so that when the time comes to fix this for binary data the guts of the main executing loop will not need to be changed
  2) Cleaned up options so that it will not destroy data by default and will clean up itself by default. So no leaving around of gobs of data.
  3) Added option of --only-print to see the SQL it would have executed
  4) Parsing handles whitespace trick (which will come back to bite someone I expect)
  5) Delimeter is now a single character
  6) All memory allocated should now be freed.
  7) Set defaults so that only a single run will occur if none are given.
  8) You can now change the schema that it runs against.
mysql-test/r/information_schema.result:
  Fix for Antony's merge
mysql-test/r/mysqlslap.result:
  New result set
  More testing
mysql-test/t/mysqlslap.test:
  More testing

into  mysql.com:/home/dlenev/src/mysql-5.1-merges


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Manual merge.
mysql-test/t/information_schema.test:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.

remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source


include/config-netware.h:
  put undef HAVE_ARCHIVE_DB where it belongs

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

storage/archive/azio.c:
  Cleanup.
storage/archive/azlib.h:
  Moved include lines about.

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

Fix for Antony's push. I've also changed from using the zlib off_t pointer type to my_off_t to fix issues around buggy zlib versions and to make sure file sizes are consistent through out mysql.



mysql-test/r/information_schema.result:
  Fix for Antony adding plugins to information schema.
sql/ha_archive.cc:
  Fix for now using my_off_t, no need to worry about buggy zlib's anymore.
sql/ha_archive.h:
  Update to fix issues with buggy zlib.
storage/archive/azio.c:
  Moved to using my_off_t (which should fix problems with most fille system size issues).
storage/archive/azlib.h:
  Change to using my_off_t

test for LONGLONG_MIN in decimal.c


myisam/mi_create.c:
  lock THR_LOCK_myisam later
mysys/thr_alarm.c:
  remove misplaced comment and "safety" if()
server-tools/instance-manager/instance.cc:
  add unlock
strings/decimal.c:
  correct the test for LONGLONG_MIN. fix debug sprintf