Commit graph

26882 commits

Author SHA1 Message Date
unknown
95b16dfa1d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmsrv/Services.cpp:
  Auto merged
2005-10-06 10:59:58 +02:00
unknown
3c2dca475d my_pthread.h:
Let pthread_mutex_init() macro return 0 on Windows
mysql_priv.h:
  Return type is to be 'my_bool' for 'opt_enable_shared_memory'


sql/mysql_priv.h:
  Return type is to be 'my_bool' for 'opt_enable_shared_memory'
include/my_pthread.h:
  Let pthread_mutex_init() macro return 0 on Windows
2005-10-06 03:49:14 +02:00
unknown
157e1fcb64 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-05 22:07:04 +02:00
unknown
99a806a9c8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-05 20:11:24 +02:00
unknown
fcc644fff7 Bug#12935 Local and XA transactions not mutually exclusive 2005-10-05 19:58:16 +02:00
unknown
7b54f5d633 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_table.cc:
  Auto merged
2005-10-05 19:37:02 +02:00
unknown
f1d7899e70 sql_table.cc:
fixed CHECKSUM TABLE to be independent from the first 'deleted' bit in the null bitmask (undefined in the InnoDB)
  bug#13710


sql/sql_table.cc:
  fixed CHECKSUM TABLE to be independent from the first 'deleted' bit in the null bitmask (undefined in the InnoDB)
  bug#13710
2005-10-05 19:36:20 +02:00
unknown
28a117f721 Merge mysql.com:/home/jimw/my/mysql-5.0-13071
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-05 10:07:04 -07:00
unknown
ab2cd8689d Fail when two messages exist for the same language for an error in the
server error messages file. (Bug #13071)


extra/comp_err.c:
  Fail when two messages for the same language are given for an error
2005-10-05 10:06:31 -07:00
unknown
07172cabdf Bug#13143 - formatID should not affect XID's uniqueness 2005-10-05 16:38:53 +02:00
unknown
e97a9d5990 Bug #11749 No message slogan found for Signal 8 received. (need better message)
+ revised error messages after feedback
+ revides classifications and status
+ removed all progError(..0..) to make sure all error invocations have an error code
+ added some new error codes to replace some generic usage of SYSTEM_ERROR
+ removed some unused codes


configure.in:
  Bug #11749  	No message slogan found for Signal 8 received. (need better message)
ndb/include/kernel/signaldata/SystemError.hpp:
  + removed some unused codes
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  + removed all progError(..0..) to make sure all error invocations have an error code
ndb/src/kernel/main.cpp:
  Bug #11749  	No message slogan found for Signal 8 received. (need better message)
2005-10-05 16:35:28 +02:00
unknown
3410309f26 Revert
BUILD/SETUP.sh:
  Remove -ansi
2005-10-05 14:37:42 +02:00
unknown
625c9582e2 Make mysql_fix_privilege_tables.sh not dependent on the current directory.
scripts/mysql_fix_privilege_tables.sh:
  Make the script not dependent on the current directory.
2005-10-05 01:08:22 +04:00
unknown
ef16a04160 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
2005-10-04 21:43:56 +02:00
unknown
822b0737b9 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-04 21:37:51 +02:00
unknown
04af49a97f innodb.result:
somehow it didn't get into the previous changeset


mysql-test/r/innodb.result:
  somehow it didn't get into the previous changeset
2005-10-04 21:37:50 +02:00
unknown
c54cb75c2e - to ensure maximum available memory for TUP DataMem
moved all array allocation to READ_CONFIG_REQ (except CMVI which was not possible)
reorganized READ_CONFIG_REQ call order in ndb cntr to make sure TUP allocates first
moved allocations internally in TUP to allocate DataMem first
2005-10-04 20:06:02 +02:00
unknown
463d86a9bf Changed __USE_XOPEN to _XOPEN_SOURCE and got rid of
some extra code.
2005-10-04 20:22:39 +03:00
unknown
ec4e385ca5 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2005-10-04 19:53:07 +03:00
unknown
b2fa7d16c2 Fixed several boolean type options used in my_long_options[].
Some options were declared as 'bool', but since those are being
handled in my_getopt.c, bool can be machine dependent. To make
sure it works in all circumstances, the type should be my_bool
for C (not C++) programs.


sql/mysql_priv.h:
  Fixed some bools to my_bools.
sql/mysqld.cc:
  Changed several bools to my_bools.
sql/slave.cc:
  Changed bool to my_bool.
sql/slave.h:
  Changed bool to my_bool.
2005-10-04 19:52:12 +03:00
unknown
658eec0678 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-10-04 18:10:38 +02:00
unknown
7ba7eff0b3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/fix-5.0
2005-10-04 08:26:24 -07:00
unknown
dee0ea4b6c Some fixes including implicit declaration of a function,
using wrong type in assignment etc.


cmd-line-utils/readline/complete.c:
  Fixed problem with implicitely defining wcwidth() in case when
  compiling with icc.
cmd-line-utils/readline/display.c:
  Fixed problem with implicitely defining wcwidth() in case when
  compiling with icc.
cmd-line-utils/readline/mbutil.c:
  Fixed problem with implicitely defining wcwidth() in case when
  compiling with icc.
server-tools/instance-manager/protocol.cc:
  Fixed some types from int to char. Made ERROR_PACKET_CODE
  static global variable in this file.
sql/log.cc:
  Removed warning of unused goto when not in debug mode.
2005-10-04 18:20:57 +03:00
unknown
ba95081510 sql_table.cc, table.cc, table.h:
fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
  bug#13710


sql/table.h:
  fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
  bug#13710
sql/table.cc:
  fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
  bug#13710
sql/sql_table.cc:
  fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
  bug#13710
2005-10-04 17:04:20 +02:00
unknown
4bb94ee1f1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
2005-10-04 16:36:10 +02:00
unknown
ee6e983c5c Move -ansi from global_warnings to cxx_warnings 2005-10-04 14:42:02 +02:00
unknown
d9e5eaa572 Bug#11739 SendBufferMemory set to 294967039 causes core where max = 4294967039
- added proper error message on all failed array pool mallocs
2005-10-04 11:27:14 +02:00
unknown
5362ca276c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/fix-5.0


sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2005-10-03 21:09:01 -07:00
unknown
a454c695d3 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


sql/sql_base.cc:
  Auto merged
2005-10-04 04:03:48 +02:00
unknown
ed35cecdcc Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers.
May changes were to simplify storage engine setup and support for legacy call to show storage engines.


mysql-test/r/ps_1general.result:
  Fixed test results for new listing order
sql/examples/ha_tina.cc:
  Removed dead code
sql/examples/ha_tina.h:
  Removed dead code
sql/ha_archive.cc:
  Capitalized sotrage engine name and moved disabled code.
sql/ha_berkeley.cc:
  Moved deisabled code
sql/ha_federated.cc:
  Removed disabled code
sql/ha_innodb.cc:
  Removed disabled message
sql/ha_ndbcluster.cc:
  Removed disabled message
sql/handler.cc:
  Added in legacy support for sotrage engine listing (ala Serg's request). Removed handlertons variables and we now have simplified ha_init code.
sql/handler.h:
  No longer need handlertons array.
2005-10-03 18:42:30 -07:00
unknown
443b16861b Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-13410


sql/item.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-10-03 22:02:22 +03:00
unknown
a1f9ec0192 Bug #13197 NDB needs better error message for not enough memory.
- added 2 new error codes for out of data and index memory during SR

+ removed c++ style comments from c file


ndb/include/mgmapi/ndbd_exit_codes.h:
  Bug #13197  	NDB needs better error message for not enough memory.
  - added 2 new error codes for out of data and index memory during SR
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Bug #13197  	NDB needs better error message for not enough memory.
  - added 2 new error codes for out of data and index memory during SR
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Bug #13197  	NDB needs better error message for not enough memory.
  - added 2 new error codes for out of data and index memory during SR
2005-10-03 20:41:43 +02:00
unknown
b1d8aa6787 added structured ndbd exit codes
BitKeeper/deleted/.del-ErrorMessages.hpp~9ab815d55a13433a:
  Delete: ndb/src/kernel/error/ErrorMessages.hpp
config/ac-macros/ha_ndbcluster.m4:
  add ndb mgmapi to ndbcluster_includes
extra/perror.c:
  perror to print also ndbd exit codes
ndb/include/Makefile.am:
  added new ndbd exit code include file to src distribution
ndb/include/kernel/signaldata/EventReport.hpp:
  backported from 5.1, included node id in event report signal
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  backported from 5.1, included node id in event report signal
2005-10-03 20:04:44 +02:00
unknown
97bce7ebd0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/handler.h:
  Auto merged
2005-10-03 19:53:00 +02:00
unknown
d8972f1e8c Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/tmp-mysql-5.0
2005-10-03 21:08:42 +04:00
unknown
a40601b13b Unset EOLN_NATIVE flag for proper tests execution under win32.
mysql-test/include/check_var_limit.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_big5.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_compress.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_crypt.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_outfile.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_query_cache.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_tis620.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_ucs2.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_ujis.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/not_embedded.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/system_db_struct.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/test_outfile.inc:
  Turn off EOLN_NATIVE flag
mysql-test/r/greedy_optimizer.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_bdb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_innodb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_innodb2.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_ror.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_ror_cpk.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/join_nested.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rowid_order_bdb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rowid_order_innodb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_session_var.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sp-error.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sp-security.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sp.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sum_distinct.result:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/des_key_file:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/init_file.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata1.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata2.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata3.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata4.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/rpl_loaddata.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/rpl_loaddata2.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/warnings_loaddata.dat:
  Turn off EOLN_NATIVE flag
mysql-test/t/greedy_optimizer.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_bdb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_innodb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_innodb2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_ror.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_ror_cpk.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/join_nested.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rowid_order_bdb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rowid_order_innodb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_session_var.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sp-error.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sp-security.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sp.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sum_distinct.test:
  Turn off EOLN_NATIVE flag
2005-10-03 21:04:04 +04:00
unknown
257eddcb81 Fix -ansi -pedantic compilation failure. 2005-10-03 19:44:53 +04:00
unknown
aa44e79c19 ndb -
fix solaris problem
  (dont print null)


ndb/src/mgmsrv/Services.cpp:
  Dont print null address
2005-10-03 16:06:07 +02:00
unknown
f2b9c3e08c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-03 11:57:55 +02:00
unknown
b2ee385ff3 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
2005-10-03 11:56:23 +02:00
unknown
eaeb04a7b1 ndb - mysql-test-run ndb_config
Fix 32/64 bit insecure code 


ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Fix 32/64 bit insecure/useless code
2005-10-03 11:49:06 +02:00
unknown
47e822ecab Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


sql/handler.h:
  Auto merged
2005-10-03 10:39:35 +02:00
unknown
b912aff870 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
2005-10-03 10:08:02 +02:00
unknown
cdb5719257 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/fix-5.0


sql/ha_blackhole.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_archive.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/ha_federated.cc:
  Merge fix.
2005-10-02 20:13:18 -07:00
unknown
5655d31d5f Next big patch for loadable storage engines!
Handlerton array is now created instead of using sys_table_types_st. All storage engines can now have inits and giant ifdef's are now gone for startup. No compeltely clean yet, handlertons will next be merged with sys_table_types. Federated and archive now have real cleanup if their inits fail. 


sql/examples/ha_archive.cc:
  Modifications for new ha_init code. The init method now checks for errors and will not start up if the errors occur.
sql/examples/ha_archive.h:
  Change for new init method.
sql/examples/ha_example.cc:
  New handlerton pieces.
sql/examples/ha_tina.cc:
  New handlerton pieces.
sql/ha_berkeley.cc:
  New handlerton pieces, plus changes for ha_init changes. I'm not happy with our current "skip" setup.
sql/ha_berkeley.h:
  Change in init return.
sql/ha_blackhole.cc:
  Changes for new handlerton pieces.
sql/ha_federated.cc:
  Changes for new handlerton and true cleanup code.
sql/ha_heap.cc:
  Changes for new handlerton returns.
sql/ha_innodb.cc:
  Changes for handlerton code.
sql/ha_innodb.h:
  Change in init.
sql/ha_myisam.cc:
  Changes for additional handlerton bits.
sql/ha_myisammrg.cc:
  Changes for  new handlerton bits.
sql/ha_ndbcluster.cc:
  Changes for new handlerton bits.
sql/ha_ndbcluster.h:
  Changes for handlerton bits.
sql/handler.cc:
  Changes for ditching show_table_type_st types, and collapsing it into a handlerton array. The ha_init now just loops through all handlers to init (much cleaner...). handlertons and sys_table_types should be merged next.
sql/handler.h:
  Additions for sys_table_types
sql/log.cc:
  Clean up of binlog for changes in handlerton
sql/mysql_priv.h:
  Removed unneeded define for binlog_init
sql/sql_show.cc:
  Changes for change in handlerton to sys_table_types
2005-10-02 19:44:28 -07:00
unknown
0c5470aa2e Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-01 21:10:18 +02:00
unknown
7e0e3cb7b9 mysqld.vcproj:
Removed "examples/" from path to "ha_archive.cc"


VC++Files/sql/mysqld.vcproj:
  Removed "examples/" from path to "ha_archive.cc"
2005-10-01 21:05:09 +02:00
unknown
f0d20c9f71 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2005-10-01 18:03:39 +02:00
unknown
d4a9174434 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-01 17:24:13 +02:00
unknown
c96cf154a8 init_db.sql:
mysql.user.password doesn't need utf8


mysql-test/lib/init_db.sql:
  mysql.user.password doesn't need utf8
2005-10-01 17:21:09 +02:00