Commit graph

28989 commits

Author SHA1 Message Date
unknown
65c560e9b8 Change for plugin storage engine to be built after mysqld
Makefile.am:
  Change build order for plugins
config/ac-macros/storage.m4:
  Change build order for plugins
configure.in:
  Change build order for plugins
storage/Makefile.am:
  add csv and example to dist
storage/csv/Makefile.am:
  remove unneeded dep
storage/example/Makefile.am:
  remove unneeded dep
2005-12-21 14:58:03 -08:00
unknown
597dc9a8e1 Fix for plugins work
storage/csv/Makefile.am:
  Build currently depends on sql/sql_yacc.h
storage/example/Makefile.am:
  Build currently depends on sql/sql_yacc.h
storage/example/ha_example.cc:
  remove old handlerton entries
2005-12-21 14:03:57 -08:00
unknown
c3c43e129b plugin version changes
include/plugin.h:
  relocate version
sql/handler.cc:
  no version checks here
sql/handler.h:
  version is kinda short
sql/sql_show.cc:
  version is a short, rearrange and show all
storage/csv/ha_tina.cc:
  rearrange version
storage/example/ha_example.cc:
  rearrange version
2005-12-21 12:50:50 -08:00
unknown
5459c9709e Merge xiphis.org:/home/antony/work2/mysql-5.1
into  xiphis.org:/home/antony/work3/mysql-5.1-plugable-2


configure.in:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  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/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/sql_table.cc:
  SCCS merged
2005-12-21 10:26:39 -08:00
unknown
613dd50a33 Finalize storage engine plugins
Give BerkeleyDB savepoints
Remove "enum db_type" from most of the code


storage/example/ha_example.h:
  Rename: sql/examples/ha_example.h -> storage/example/ha_example.h
storage/csv/ha_tina.h:
  Rename: sql/examples/ha_tina.h -> storage/csv/ha_tina.h
config/ac-macros/storage.m4:
  if hton name is "no", then we don't install it as a builtin
configure.in:
  pluggable changes
include/plugin.h:
  version field
mysql-test/r/bdb.result:
  savepoint results copied from innodb test
mysql-test/r/information_schema.result:
  PLUGINS information schema
mysql-test/r/information_schema_db.result:
  PLUGINS information schema
mysql-test/t/bdb.test:
  savepoint test copied from innodb test
sql/Makefile.am:
  tina and example are not here anymore
sql/authors.h:
  minor tweek
sql/ha_archive.cc:
  remove unwanted handlerton entries
sql/ha_berkeley.cc:
  remove unwanted handlerton entries
  support for savepoints
  changes to show logs
sql/ha_blackhole.cc:
  remove unwanted handlerton entries
sql/ha_federated.cc:
  remove unwanted handlerton entries
sql/ha_heap.cc:
  remove unwanted handlerton entries
sql/ha_innodb.cc:
  remove unwanted handlerton entries
  changes for show status
sql/ha_myisam.cc:
  remove unwanted handlerton entries
sql/ha_myisammrg.cc:
  remove unwanted handlerton entries
sql/ha_ndbcluster.cc:
  remove unwanted handlerton entries
  changes to stat_print
sql/ha_partition.cc:
  remove unwanted handlerton entries
  bye bye enum db_type
sql/ha_partition.h:
  bye bye enum db_type
sql/handler.cc:
  remove unwanted handlerton entries
  bye bye enum db_type
sql/handler.h:
  remove unwanted handlerton entries
  bye bye enum db_type
  changes to stat_print_fn
sql/item_sum.cc:
  bye bye enum db_type
sql/log.cc:
  remove unwanted handlerton entries
sql/mysql_priv.h:
  bye bye enum db_type
sql/mysqld.cc:
  bye bye enum db_type
  reorder plugin initialization
sql/set_var.cc:
  bye bye enum db_type
sql/set_var.h:
  bye bye enum db_type
sql/sql_base.cc:
  bye bye enum db_type
sql/sql_cache.cc:
  bye bye enum db_type
sql/sql_class.h:
  bye bye enum db_type
sql/sql_delete.cc:
  bye bye enum db_type
sql/sql_insert.cc:
  bye bye enum db_type
sql/sql_lex.h:
  show plugin
sql/sql_parse.cc:
  bye bye enum db_type
sql/sql_partition.cc:
  bye bye enum db_type
sql/sql_plugin.cc:
  loadable storage engines
sql/sql_plugin.h:
  loadable storage engines
sql/sql_rename.cc:
  bye bye enum db_type
sql/sql_select.cc:
  bye bye enum db_type
sql/sql_show.cc:
  SHOW PLUGIN
  PLUGINS information schema
  changes to show engines
sql/sql_table.cc:
  bye bye enum db_type
sql/sql_view.cc:
  bye bye enum db_type
sql/sql_view.h:
  bye bye enum db_type
sql/sql_yacc.yy:
  bye bye enum db_type
sql/table.cc:
  bye bye enum db_type
sql/table.h:
  bye bye enum db_type
sql/unireg.cc:
  bye bye enum db_type
storage/csv/ha_tina.cc:
  make tina into a loadable plugin
storage/example/ha_example.cc:
  make into a plugin
storage/csv/Makefile.am:
  New BitKeeper file ``storage/csv/Makefile.am''
storage/example/Makefile.am:
  New BitKeeper file ``storage/example/Makefile.am''
2005-12-21 10:18:40 -08:00
unknown
ec6121fb40 Raise the version number. 2005-12-21 16:09:12 +01:00
unknown
23ab8a3a72 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.xml
2005-12-21 17:14:58 +04:00
unknown
5e4c3ce682 Adding XPath support: ExtractValue and UpdateXML functions.
libmysqld/Makefile.am:
sql/Makefile.am:
  Adding new source files.
  Adding new file into build process.
include/my_xml.h:
strings/xml.c:
  Adding new XML parse flags to skip text normalization and 
  to use relative tag names. Adding enum for XML token types.
sql/lex.h:
  Making parser aware of new SQL functions.
sqll/item_create.h, sql/item_create.cc:
  Adding creators for ExtractValue and UpdateXML.
sql/item.h:
  Adding new Item types: nodeset and nodeset comparator.
sql/item_xmlfunc.h
sql/item_xmlfunc.cc
  Adding new classes implementing XPath functions.
mysql-test/t/xml.test, mysql-test/r/xml.result:
  New files: adding test case


include/my_xml.h:
  Adding ExtractValue and UpdateXML functions.
  Adding XML parser flags and enum for XML token types.
sql/Makefile.am:
  Adding new source files.
sql/item.h:
  Adding new Item types: nodeset and nodeset comparator.
sql/item_create.cc:
  Adding creators for ExtractValue and UpdateXML.
sql/item_create.h:
  Adding creators for ExtractValue and UpdateXML.
sql/lex.h:
  Make parse aware of new SQL functions.
strings/xml.c:
  Adding new flags to skip text normalization and 
  to use relative tag names.
libmysqld/Makefile.am:
  Adding new file into build process.
2005-12-21 17:13:52 +04:00
unknown
6e8b348411 Merge bk-internal:/home/bk/mysql-5.1-new
into melody.mysql.com:/home/vadim/mysql-5.1-new
2005-12-21 09:07:06 +01:00
unknown
14b62752e0 mysql-test-run.pl:
Don't run "mysqlslap" on Windows
mysqlslap.test:
  We don't run "mysqlslap" on Windows
mysql.sln:
  Removed build of "client/mysqlslap.c" on Windows


VC++Files/mysql.sln:
  Removed build of "client/mysqlslap.c" on Windows
mysql-test/t/mysqlslap.test:
  We don't run "mysqlslap" on Windows
mysql-test/mysql-test-run.pl:
  Don't run "mysqlslap" on Windows
2005-12-21 06:02:04 +01:00
unknown
5d853f5f00 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2005-12-21 06:02:03 +01:00
unknown
3bf3304c8b Minor portability issue on big endian boxes 2005-12-21 00:02:02 -05:00
unknown
cdfd9f7f6f BUG#15981 Current 5.1 fails for NDB tests
sql/ha_ndbcluster.cc:
  Add part that where lost when merging from 5.0 to 5.1
2005-12-20 20:53:29 +01:00
unknown
59b4604611 Fast mutexes implementation
(spin-loop inside pthread_mutex_lock).

thr_mutex.c:
  Added spinloop in mutex_lock
my_pthread.h:
  Added definition of my_pthread_fastmutex_t
configure.in:
  Added --with-fast-mutexes switch


configure.in:
  Added --with-fast-mutexes switch
include/my_pthread.h:
  Added definition of my_pthread_fastmutex_t
mysys/thr_mutex.c:
  Added spinloop in mutex_lock
2005-12-20 14:56:45 +01:00
unknown
f78594c028 Bug #15483 mysqlslap client fails in mysqlslap test.
mysql-test/t/disabled.def:
  Enable mysqlslap, it works now when it's running in silent mode.
2005-12-20 12:57:51 +01:00
unknown
30a61690f6 Bug #15845 New file "client/mysqlslap.c" break compilation on QNX, missing "sys/shm.h"
client/mysqlslap.c:
  Remove some include directives which (I hope) are superfluos
2005-12-20 12:56:48 +01:00
unknown
e0d9f5bd96 my_sys.h:
Added MAP_NORESERVE set to 0 for Windows
config-win.h:
  If MAX_INDEXES is not set, set it to 64 on Windows


include/config-win.h:
  If MAX_INDEXES is not set, set it to 64 on Windows
include/my_sys.h:
  Added MAP_NORESERVE set to 0 for Windows
2005-12-19 23:23:53 +01:00
unknown
5f4100926d sql_trigger.cc, item.cc:
BUG#15842: Change in "item.cc" adding Item_sp_variable breaks compile on HP-UX 11.23
  Fix: make explicit conversion to non-constant string (char *)
  (change by anozdrin@mysql.com)


sql/item.cc:
  Make explicit conversion to non-constant string (char *)
sql/sql_trigger.cc:
  Make explicit conversion to non-constant string (char *)
2005-12-19 17:36:20 +01:00
unknown
a62aaaef7a my_global.h:
Fix for bug #15841: Change in sql_map.cc and mmap breaks on HP-UX
  - in order to enable the mmap64() (and others) define
  _LARGEFILE64_SOURCE in case of _LARGEFILE_SOURCE defined on HPUX.


include/my_global.h:
  Fix for bug #15841: Change in sql_map.cc and mmap breaks on HP-UX
  - in order to enable the mmap64() (and others) define
  _LARGEFILE64_SOURCE in case of _LARGEFILE_SOURCE defined on HPUX.
2005-12-19 17:00:53 +01:00
unknown
ec7a7ac278 Bug fix for bug #15843 "Added mmap support in myisam creates compile problem
on AIX 5.2"

Added dummy definition of MAP_NORESERVE for systems which doesn't provide it,
removed duplicates

my_sys.h:
  added definition for MAP_NORESERVE
  (for Irix and AIX systems)
sql_map.cc:
  removed definition of MAP_NORESERVE
mi_packrec.c:
  removed definition of MAP_NORESERVE and MMAP_PRIVATE


storage/myisam/mi_packrec.c:
  removed definition of MAP_NORESERVE and MMAP_PRIVATE
sql/sql_map.cc:
  removed definition of MAP_NORESERVE
include/my_sys.h:
  added definition for MAP_NORESERVE
  (for Irix and AIX systems)
2005-12-19 14:16:21 +01:00
unknown
32279956f6 mysql-test/t/federated_transactions.test
Fix a typo: Trailing ";" for "source" command.


mysql-test/t/federated_transactions.test:
  Fix a typo: Trailing ";" for "source" command.
2005-12-19 11:12:53 +01:00
unknown
e57903f51d Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1


extra/Makefile.am:
  Auto merged
2005-12-19 08:33:27 +01:00
unknown
a466e28000 federated_transactions.test:
Test require Berkeley DB


mysql-test/t/federated_transactions.test:
  Test require Berkeley DB
2005-12-19 04:05:48 +01:00
unknown
b39c4c77cf Merge 2005-12-19 03:49:02 +01:00
unknown
2162019056 mysql-test-run.pl:
Script "my_print_defaults" is to be searched for as executable


mysql-test/mysql-test-run.pl:
  Script "my_print_defaults" is to be searched for as executable
2005-12-19 03:39:25 +01:00
unknown
f6160c7de6 disabled.def:
Disabled 'type_time' until 15805 is closed


mysql-test/t/disabled.def:
  Disabled 'type_time' until 15805 is closed
2005-12-19 03:05:26 +01:00
unknown
2a5aa3f251 mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
  new file


VC++Files/mysql.sln:
  Added "client/mysqlslap"
netware/Makefile.am:
  Added "client/mysqlslap"
scripts/make_binary_distribution.sh:
  Added "client/mysqlslap"
support-files/mysql.spec.sh:
  Added "client/mysqlslap"
2005-12-19 01:12:11 +01:00
unknown
a5ecdebac3 Merge
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_multi.result:
  Auto merged
mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/r/type_time.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_multi.test:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
zlib/Makefile.am:
  Auto merged
2005-12-18 18:11:19 +01:00
unknown
2de5c14162 Merge
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_multi.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_multi.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
2005-12-18 15:26:37 +01:00
unknown
a3a5df43a5 Makefile.am:
Added 5.0 specific build scripts


BUILD/Makefile.am:
  Added 5.0 specific build scripts
2005-12-18 15:07:58 +01:00
unknown
de1c06b9a2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


BUILD/Makefile.am:
  Auto merged
2005-12-18 15:02:13 +01:00
unknown
aa6d8551f8 Merge 2005-12-18 14:55:05 +01:00
unknown
e97a4a4a17 Makefile.am:
Adjusted listing of files to put into source TAR
2005-12-18 14:51:19 +01:00
unknown
152e0edc39 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-12-17 04:22:16 +01:00
unknown
6642eb0581 Merge mysql.com:/home/jimw/my/mysql-5.1-14809
into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/ha_berkeley.cc:
  Auto merged
2005-12-16 14:31:27 -08:00
unknown
7c49bdc10e Fixed default values for counters to 0 2005-12-16 22:53:10 +02:00
unknown
9f444445bc Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  regul.home.lan:/mnt/md/bk/mysql-5.0
2005-12-16 22:15:53 +02:00
unknown
c181806154 Merge mysql.com:/M51/try-5.1-extra into mysql.com:/M51/mysql-5.1 2005-12-16 12:47:14 +01:00
unknown
1aba662c7d storage/innobase/Makefile.am :
Restore "make dist" for the header files in "storage/innobase/include".


storage/innobase/Makefile.am:
  A recent change (coming from the "innobase" team, pushed by alexi) broke "make dist"
  which is needed for release builds (deletion of "storage/innobase/include/Makefile.am").
  The effect was that files "storage/innobase/include/*.h" were missing in the source.tgz
  
  Restore "make dist" without fully reverting the change by listing the files in a (new)
  "EXTRA_DIST" target in the parent level directory.
2005-12-16 12:45:43 +01:00
unknown
5c12976f53 BUG#15805: Disabled test type_time; fails in --ps-protocol mode.
mysql-test/t/disabled.def:
  Disabled test type_time; fails in --ps-protocol mode.
2005-12-16 09:38:30 +01:00
unknown
7c4ada147e Fixed stress parts in shell and perl versions of mysql-test-run script to limit stress testing
with 20 test loops in case when any limit parameter was specified



mysql-test/lib/mtr_stress.pl:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
mysql-test/mysql-test-run.pl:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
mysql-test/mysql-test-run.sh:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
2005-12-16 00:23:55 +02:00
unknown
6f3f33b500 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.clean
2005-12-15 22:06:02 +04:00
unknown
49a22151cc Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.clean
2005-12-15 21:00:14 +04:00
unknown
9008814ef7 tests fixed as we implement informative error message
mysql-test/r/partition_list.result:
  test result fixed
mysql-test/r/partition_range.result:
  test result fixed
mysql-test/t/partition_list.test:
  test fixed
mysql-test/t/partition_range.test:
  test fixed
2005-12-15 20:56:14 +04:00
unknown
4db14a57e7 Merge mysql.com:/home/alexi/dev/mysql-4.1-12440
into  mysql.com:/home/alexi/dev/mysql-5.0-12440


mysql-test/r/type_time.result:
  Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql-common/my_time.c:
  Auto merged
zlib/Makefile.am:
  Auto merged
2005-12-15 18:59:40 +03:00
unknown
52c0440085 Fixed BUG #12440: "Incorrect processing of time values containing
long fraction and/or large exponent part".


mysql-test/r/type_time.result:
  Fixed testcases results (bug #12440)
mysql-test/t/type_time.test:
  Added testcases for bug #12440
sql-common/my_time.c:
  Fixed bug #12440: "Incorrect processing of time values containing
   long fraction and/or large exponent part".
   Modified str_to_time(). Process properly fraction part containing
   more than 6 digits. Check for existence of exponent part which
   may result from %g formatting applied to time value specified as
   large real number.
2005-12-15 18:48:08 +03:00
unknown
a848d91ea3 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/r/ndb_multi.result:
  merge
mysql-test/t/ndb_multi.test:
  merge
sql/ha_ndbcluster.cc:
  merge
2005-12-15 15:11:42 +01:00
unknown
4ede1ed354 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2005-12-15 15:07:20 +01:00
unknown
cb179dd38d Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
into trift-lap.fambruehe:/MySQL/M51/work-5.1


mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
2005-12-15 14:01:40 +01:00
unknown
36736898f3 Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.clean
2005-12-15 16:55:12 +04:00