summaryrefslogtreecommitdiff
path: root/include/my_global.h
Commit message (Collapse)AuthorAgeFilesLines
* Fix spelling errorunknown2006-04-071-1/+1
|
* Bug#17716 Slave crash in net_clear on qnxunknown2006-02-271-0/+9
| | | | | | | | - Set FD_SETSIZE before including "sys/select.h" include/my_global.h: Define FD_SETSIZE on QNX before including "sys/select.h" or "sys/time.h". This defines number of bits in fd_set type used for 'select'
* EADDRINUSE is not defined on Windows.unknown2006-01-041-0/+3
|
* my_global.h:unknown2005-12-031-0/+11
| | | | | | | | Make __cxa_pure_virtual weak symbol include/my_global.h: Make __cxa_pure_virtual weak symbol
* Don't use PATH_MAX for FN_REFLEN as this uses too much stack spaceunknown2005-11-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Larger stack size neaded for open table on x86 64 bit Fix failing test cases Deleted symlink from bk BitKeeper/etc/ignore: added libmysqld/ha_blackhole.cc BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a: Delete: libmysqld/ha_blackhole.cc include/my_global.h: Don't use PATH_MAX for FN_REFLEN as this uses too much stack space. (With a PATH_MAX of 4096, we use 80K for opening a table as there is several objects of size FN_REFLEN on stack) mysql-test/r/federated.result: Update results after error message changes mysql-test/r/grant.result: Update results after error message changes mysql-test/r/grant2.result: Update results after error message changes sql/ha_federated.cc: Fix error messages to be more consistent sql/mysql_priv.h: Stack size to have when opening a table (This was needed on x86 64 bit Linux) sql/share/errmsg.txt: Remove quotes around error string for federated as two quotes in the output looks strange sql/sql_base.cc: More correct stack size sql/sql_parse.cc: Set thread_stack before store_globals() sql/unireg.h: More correct MAX_DBKEY_LENGTH
* Fixes bug #13377. my_open() & my_create() functions changed to use unknown2005-11-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to allow deleting opened files. my_sopen() implementation is added to support this functionality. include/my_global.h: Fixes bug #13377. Added number of constants for share delete file open option. include/my_sys.h: Fixes bug #13377. Added my_sopen function. mysys/my_create.c: Fixes bug #13377. my_create() function changed to use my_sopen() and which allows to use FILE_SHARE_DELETE flag on win32, which helps in deleting opened files. mysys/my_open.c: Fixes bug #13377. my_open() function changed to use my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to allow deleting opened files. sql/log.cc: Fixes bug #13377. Additional patch - remove reference counting for opened binlog files, introduced in initial patch of #13377. sql/sql_class.h: Fixes bug #13377. Additional patch - remove reference counting for opened binlog files, introduced in initial patch of #13377. sql/sql_repl.cc: Fixes bug #13377. Additional patch - remove reference counting for opened binlog files, introduced in initial patch of #13377.
* Several fixes revelaled by Intel compiler.unknown2005-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmd-line-utils/readline/complete.c: Added a cast. dbug/my_main.c: Added an include to avoid implicit declaration of my_thread_global_init() include/my_global.h: undef cannot be used on this predefined name. Since it is a custom fix for gcc 2.8.0, let's make it only effective in that case. include/my_sys.h: Added a new type, TYPE_NOT_SET. myisam/ft_boolean_search.c: Added casts. myisam/mi_key.c: Added cast. myisam/mi_open.c: Added cast. Changed function types. myisam/mi_test1.c: Added cast. myisam/myisamchk.c: Added cast. myisam/myisamdef.h: Changed function type. myisam/myisampack.c: Added casts. myisam/sp_key.c: Added cast. mysys/mf_iocache.c: Fixed invalid use of 0 to info->type. According to comment it should not have been set, but in earlier code by setting it to 0 would have been same as setting it to READ_CACHE. This probably was not desired, potential bug. server-tools/instance-manager/instance_options.cc: Fixed a typo. server-tools/instance-manager/protocol.cc: Changed enum to int. Changed char to uchar. Added casts. sql/mysql_priv.h: Bit overflow. sql/sql_base.cc: Removed unused label. The code below label was unused too, because there is a return just before. sql/sql_parse.cc: Removed unneccessary extra argument.
* Compile problem about "madvise()" on Solaris (bug#7156). (Patch supplied by ↵unknown2005-09-151-0/+8
| | | | Kent)
* Fix QNX warningunknown2005-09-141-1/+3
| | | | | include/my_global.h: Avoid warnings on QNX, only define HAVE_RINT if not found by configure
* Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-09-121-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/violite.h: Auto merged mysql-test/r/ndb_autodiscover.result: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/ndbapi/SignalSender.cpp: Auto merged sql-common/client.c: Auto merged sql/examples/ha_archive.cc: Auto merged sql/net_serv.cc: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged vio/viossl.c: Auto merged configure.in: Resolve conflicts
| * Merge selena.:H:/MYSQL/src/#05588-mysql-4.0unknown2005-09-071-0/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into selena.:H:/MYSQL/src/#05588-mysql-4.1 BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220: Auto merged BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: Auto merged include/violite.h: Auto merged sql/net_serv.cc: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged include/my_global.h: SCCS merged
| | * Fixes bug #5588. vio_was_interrupted() function was added to detectunknown2005-08-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read timeout properly on win32. include/my_global.h: Added win32 specific socket timeout error code. include/violite.h: Added vio_was_interrupted function that returns true if operation was not completed due to timeout. sql/mini_client.cc: added a check that replication read was not completed due to timeout. sql/net_serv.cc: net->last_errno should be equal to ER_NET_READ_INTERRUPTED in case if read operation was not completed due to timeout. vio/vio.c: added initialization code for vio_was_interrupted() function. vio/viosocket.c: Added vio_was_interrupted function that returns true if operation was not completed due to timeout.
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-08-311-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean configure.in: Auto merged include/my_global.h: Auto merged myisam/mi_extra.c: Auto merged mysql-test/r/lowercase_table.result: Auto merged mysql-test/t/lowercase_table.test: Auto merged mysys/my_access.c: Auto merged BitKeeper/deleted/.del-extra.c~706f29d72beb2565: Auto merged sql/examples/ha_tina.cc: Resolve conflict
| * | Add test for madvise() being declared in C++ code, because it is notunknown2005-08-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on Solaris even though it is available, and declare it ourselves in that case. (Bug #7156) configure.in: Add test for madvise() being declared when C++ compiler is used. include/my_global.h: Handle madvise() being available but not declared in C++ isam/extra.c: Fix typo in define test myisam/mi_extra.c: Fix typo in define test sql/examples/ha_tina.cc: Test that we have madvise() before trying to call it.
* | | libmysqld.vcproj:unknown2005-08-251-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed spelling "Commerical" to "Commercial" mysqld.vcproj: Aligned engines with Unix version sql_class.cc: VC7 needs my_free() cast of first arg to be (gptr) my_global.h: Can't assume macro set_timespec_nsec exists if set_timespec does include/my_global.h: Can't assume macro set_timespec_nsec exists if set_timespec does sql/sql_class.cc: VC7 needs my_free() cast of first arg to be (gptr) VC++Files/sql/mysqld.vcproj: Aligned engines with Unix version VC++Files/libmysqld/libmysqld.vcproj: Changed spelling "Commerical" to "Commercial"
* | | Cleanup during review of new pushed codeunknown2005-08-221-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: Safer macros to avoid possible overflows sql/item_cmpfunc.cc: Simple optimization sql/sp_head.cc: Indentation fixes Remove not needed "else" levels Added error checking for 'new' Simpler reseting of thd->spcont in execute_procedure sql/sql_base.cc: Faster new sql/sql_lex.cc: Use 'TRUE' instead of 'true' sql/sql_parse.cc: Faster new sql/sql_view.cc: No need to set 'tables' as it's not used sql/table.cc: Simpler DBUG_ASSERT()
* | | Fix up definition of new set_timespec_nsec() macro. (Related to bug #12582)unknown2005-08-171-4/+13
| | | | | | | | | | | | | | | | | | include/my_global.h: Add distinct set_timespec_nsec() macro for when HAVE_TIMESPEC_TS_SEC is defined.
* | | Fix SLEEP() to be interruptable. (Bug #12582)unknown2005-08-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: Add set_timespec_nsec() for setting higher-resolution time. sql/item_func.cc: Use pthread_cond_timedwait() for SLEEP() so that it can be killed using the normal thread/query-killing code.
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-07-191-3/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean extra/perror.c: Auto merged include/my_global.h: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/select.result: Auto merged ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged ndb/src/mgmsrv/main.cpp: Auto merged sql/des_key_file.cc: Auto merged sql/field_conv.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/t/select.test: Resolve conflicts scripts/mysqld_safe.sh: Resolve conflict sql/item.cc: Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR can be longer in 5.0 than 4.1. sql/log_event.cc: Resolve conflict sql/mysql_priv.h: Resolve conflict sql/mysqld.cc: Remove incorrect fix (merge from 4.1) sql/sql_show.cc: Resolve conflict
| * | Simple fixes during review of new codeunknown2005-07-191-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: Added floatget() to read unaligned flaot mysql-test/r/select.result: Added test for found_rows() mysql-test/t/select.test: Added test for found_rows() sql/des_key_file.cc: Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition sql/field_conv.cc: Added optimizzed varsion of do_cut_string (for simple character sets) sql/item_func.cc: Simplify code (and ensure DBUG_ENTER is excuted before main code) sql/item_strfunc.cc: Safe calculation of max_length This was needed as max_length can now be 1<<32-1 (after konstantins recent patch to fix BLOB_LENGTH) Remove init_des_key_file() as this is not initialized in mysqld.cc sql/item_timefunc.cc: Safe calculation of max_length This was needed as max_length can now be 1<<32-1 (after konstantins recent patch to fix BLOB_LENGTH) sql/log_event.cc: Simplify code sql/mysql_priv.h: Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition sql/mysqld.cc: Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition Revert wrong patch of calling close_connection() in first close_connections() loop. (Bug #7403) Instead we now print a warning for closed connections only if mysqld is sarted with --warnings Added comments to make the close_connections() logic clearer sql/sql_prepare.cc: Use floatget() and doubleget() to protect against unaligned data sql/sql_select.cc: Fixed some cases unlikely cases where found_rows() would return wrong for queries that would return 0 or 1 rows
* | | Merge mysql.com:/home/bkroot/mysql-4.1unknown2005-07-131-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/bk/mysql-5.0 BitKeeper/etc/config: Auto merged include/my_global.h: Auto merged sql/des_key_file.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.cc: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged sql/log.cc: Manual merge sql/slave.cc: Manual merge
| * | Fixed some vio code that was using ___WIN__ instead of __WIN__unknown2005-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: set SOCKET_EWOULDBLOCK to the proper windows def WSAEWOULDBLOCK sql/net_serv.cc: fixed typo with using 3 leading underscores instead of 2 vio/vio.c: fixed typo with using 3 leading underscores instead of 2 vio/viosocket.c: fixed typo with using 3 leading underscores instead of 2
* | | Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1unknown2005-07-121-4/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 include/my_global.h: Auto merged mysql-test/t/ndb_autodiscover.test: Auto merged mysql-test/r/ndb_autodiscover.result: Merge
| * | Fix for gcc 4.0 (they have removed min/max operators).unknown2005-07-111-4/+1
| | | | | | | | | | | | | | | include/my_global.h: Fix for gcc 4.0 (they removed min/max)
* | | Merge mysql.com:/usr/home/ram/work/mysql-4.1unknown2005-07-061-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-5.0 include/my_global.h: Auto merged
| * | a fix (bug #11544: Use of missing rint() function on QNX).unknown2005-07-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: a fix (bug #11544: Use of missing rint() function on QNX). We have to explicitly specify std:: namespace to use rint() and isnan() functions in C++ scope on QNX due to an error in the /usr/include/math.h
* | | Bug#10178 - failure to find a row in heap table by concurrent UPDATEsunknown2005-06-241-2/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#10568 - Function 'LAST_DAY(date)' does not return NULL for invalid argument. Manual merge. include/my_global.h: Auto merged mysql-test/t/heap_hash.test: Auto merged sql/ha_heap.h: Auto merged sql/item_timefunc.cc: Auto merged mysql-test/r/func_time.result: Manual merge. Used local for the backported fix for Bug#10568. mysql-test/r/heap_hash.result: Bug#10178 - failure to find a row in heap table by concurrent UPDATEs Manual merge. mysql-test/t/func_time.test: Manual merge. Used local for the backported fix for Bug#10568. sql/ha_heap.cc: Bug#10178 - failure to find a row in heap table by concurrent UPDATEs Manual merge.
| * | an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h).unknown2005-06-241-2/+0
| | | | | | | | | | | | | | | | | | include/my_global.h: an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h). redefine 'new' before #include <asm/atomic.h> in any case.
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-06-091-6/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/r/ps_6bdb.result: Auto merged include/my_global.h: SCCS merged
| * | Merge mysql.com:/var/tmp/sslbug/mysql-4.0unknown2005-06-081-6/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | into mysql.com:/var/tmp/sslbug/mysql-4.1 include/my_global.h: Auto merged
| | * Fix forunknown2005-06-081-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4 BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem Remove obsolete code. include/my_global.h: Obsolete code removed. OpenSSL doesn't have crypt anymore (it was dropped in ~2003). This patch fixes compilation failures with both OpenSSL and yaSSL on systems where crypt was defined in unistd.h. Conclusion is we do not use OpenSSL's crypt unless it wasn't defined in unistd.h/crypt.h and it was defined in old OpenSSL.
* | | Merge with 4.1unknown2005-06-071-14/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union client/sql_string.cc: Auto merged configure.in: Auto merged include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/olap.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/warnings.test: Auto merged mysys/raid.cc: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field.cc: Auto merged BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e: Auto merged BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_blackhole.cc: Auto merged sql/ha_heap.cc: Auto merged sql/ha_innodb.cc: 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/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_geofunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/item_uniq.cc: Auto merged sql/lock.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.h: Auto merged sql/procedure.cc: Auto merged sql/protocol.cc: Auto merged sql/protocol_cursor.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_error.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_map.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_udf.cc: Auto merged sql/examples/ha_archive.cc: Auto merged sql/examples/ha_example.cc: Auto merged sql/examples/ha_tina.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/tztime.cc: Auto merged strings/ctype-win1250ch.c: Auto merged mysql-test/r/func_gconcat.result: merge & ensure that 4.1 and 5.0 source have tests in same order mysql-test/r/innodb.result: merge & ensure that 4.1 and 5.0 source have tests in same order mysql-test/t/func_gconcat.test: merge & ensure that 4.1 and 5.0 source have tests in same order mysql-test/t/innodb.test: merge & ensure that 4.1 and 5.0 source have tests in same order sql/item_func.cc: merge sql/mysqld.cc: merge sql/opt_range.cc: merge sql/sql_parse.cc: merge Give better name to goto labels sql/sql_select.cc: merge
| * | a compiler must see '#pragma implementation' *before*unknown2005-06-051-7/+2
| | | | | | | | | | | | | | | | | | | | | '#pragma interface' (that comes with the #include'd header file)
| * | mergedunknown2005-06-031-7/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_table.cc: Auto merged mysql-test/r/create.result: merged, need fixing sql/sql_parse.cc: merged (perhaps wrong)
| | * *don't* mess with kernel defines, boy.unknown2005-06-031-18/+7
| | | | | | | | | | | | | | | | | | | | | and HAVE_ATOMIC_ADD/HAVE_ATOMIC_SUB is tested in configure
* | | Merge from 4.1unknown2005-05-261-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e: Auto merged BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e: Auto merged client/sql_string.cc: Auto merged client/sql_string.h: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysys/my_open.c: Auto merged mysys/raid.cc: Auto merged ndb/src/kernel/blocks/dbtux/Dbtux.hpp: Auto merged sql/field.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_blackhole.cc: Auto merged sql/ha_heap.cc: Auto merged sql/ha_innodb.cc: 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/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_geofunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/item_uniq.cc: Auto merged sql/item_uniq.h: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/procedure.cc: Auto merged sql/protocol.cc: Auto merged sql/protocol_cursor.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_analyse.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_map.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_udf.cc: Auto merged sql/tztime.cc: Auto merged sql/opt_range.cc: Manual merge sql/sql_parse.cc: Use select_lex pointer instead of lex->select_lex sql/sql_repl.cc: Function moved to log.cc, fix made there instead sql/sql_class.cc: Auto merged sql/sql_select.cc: Auto merged
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-261-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1 include/my_global.h: Auto merged sql/ha_myisammrg.cc: Auto merged sql/item.cc: Auto merged
| | * | Add ifdefs to control when "#pragma implementation" should be usedunknown2005-05-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some more ifdefs for "#pragma interface" client/sql_string.cc: USE_PRAGMA_IMPLEMENTATION client/sql_string.h: USE_PRAGMA_INTERFACE include/my_global.h: Use pragma implementation for gcc pre version 3 mysys/raid.cc: USE_PRAGMA_IMPLEMENTATION sql/field.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_berkeley.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_blackhole.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_heap.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_innodb.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_isam.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_isammrg.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_myisam.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_myisammrg.cc: USE_PRAGMA_IMPLEMENTATION sql/ha_ndbcluster.cc: USE_PRAGMA_IMPLEMENTATION sql/handler.cc: USE_PRAGMA_IMPLEMENTATION sql/hash_filo.cc: USE_PRAGMA_IMPLEMENTATION sql/item.cc: USE_PRAGMA_IMPLEMENTATION sql/item_cmpfunc.cc: USE_PRAGMA_IMPLEMENTATION sql/item_func.cc: USE_PRAGMA_IMPLEMENTATION sql/item_geofunc.cc: USE_PRAGMA_IMPLEMENTATION sql/item_strfunc.cc: USE_PRAGMA_IMPLEMENTATION sql/item_subselect.cc: USE_PRAGMA_IMPLEMENTATION sql/item_sum.cc: USE_PRAGMA_IMPLEMENTATION sql/item_timefunc.cc: USE_PRAGMA_IMPLEMENTATION sql/item_uniq.cc: USE_PRAGMA_IMPLEMENTATION sql/item_uniq.h: USE_PRAGMA_INTERFACE sql/log_event.cc: USE_PRAGMA_IMPLEMENTATION sql/log_event.h: USE_PRAGMA_INTERFACE sql/opt_range.cc: USE_PRAGMA_IMPLEMENTATION sql/procedure.cc: USE_PRAGMA_IMPLEMENTATION sql/protocol.cc: USE_PRAGMA_IMPLEMENTATION sql/protocol_cursor.cc: USE_PRAGMA_IMPLEMENTATION sql/set_var.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_analyse.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_analyse.h: USE_PRAGMA_INTERFACE sql/sql_class.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_crypt.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_crypt.h: USE_PRAGMA_IMPLEMENTATION sql/sql_list.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_map.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_map.h: USE_PRAGMA_INTERFACE sql/sql_olap.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_select.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_string.cc: USE_PRAGMA_IMPLEMENTATION sql/sql_udf.cc: USE_PRAGMA_IMPLEMENTATION sql/tztime.cc: USE_PRAGMA_IMPLEMENTATION
* | | | Manual merge.unknown2005-05-261-1/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqldump.c: Auto merged include/my_global.h: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/mysqldump.test: Auto merged sql/item.cc: Auto merged sql/sql_yacc.yy: Auto merged support-files/mysql.spec.sh: Auto merged client/client_priv.h: Manual merge (still to be corrected!)
| * | | simplifying new/my_arg_new wrappingunknown2005-05-241-1/+3
| |/ /
| * | Build fixes for icc, compile _without_ "-no-gnu"unknown2005-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: icc does not define __ICC when emulating gcc. Use __INTEL_COMPILER to check for icc. ndb/src/cw/cpcd/Process.cpp: Remove rlimit64 ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Remove dirent64
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-buildunknown2005-05-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp VC++Files/mysys/mysys.dsp: Auto merged include/my_global.h: Auto merged myisam/rt_split.c: Auto merged sql/field_conv.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_select.cc: Auto merged strings/my_vsnprintf.c: Auto merged
| * | | Build fixunknown2005-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | include/my_global.h: Look for __INTEL_COMPILER to detect icc
* | | | Macos 10.4 compatibility changesunknown2005-05-201-1/+1
|/ / / | | | | | | | | | | | | | | | | | | include/my_global.h: make it compilable on mac os ndb/src/kernel/SimBlockList.cpp: make it compilable with gcc 4.0
* | | Mergeunknown2005-05-091-0/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/select.test: Auto merged ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/src/ndbapi/NdbIndexOperation.cpp: Auto merged ndb/src/ndbapi/ndberror.c: Auto merged ndb/test/ndbapi/testNodeRestart.cpp: Auto merged sql/item.h: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.h: Auto merged sql/sql_udf.h: Auto merged sql/sql_yacc.yy: Auto merged configure.in: Ignore 4.1 version change ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: merge 4.1 ndb/src/ndbapi/ClusterMgr.cpp: merge ndb/test/run-test/Makefile.am: merge sql/mysql_priv.h: merge from 4.1 sql/table.cc: Merge from 4.1
| * | a fix (bug #10438: Raid stopped working because of change in atomic add ↵unknown2005-05-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | detection). include/my_global.h: a fix (bug #10438: Raid stopped working because of change in atomic add detection). In order to compile with atomic.h on itanium we redefine 'new' because it's used as a local variable in this file and conflicts with a kernel header.
| * | Merge neptunus.(none):/home/msvensson/mysql/bug10241unknown2005-05-091-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1 include/my_global.h: Auto merged
| * \ \ Merge neptunus.(none):/home/msvensson/mysql/bug10241unknown2005-05-091-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1 include/my_global.h: Auto merged sql/item.h: Auto merged
* | \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug10241unknown2005-05-091-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 include/my_global.h: Auto merged
| * | | | After review fixesunknown2005-05-091-1/+1
| | |/ / | |/| | | | | | | | | | | | | | include/my_global.h: Add "&& defined(__GNUC__)"
View Lorry Controller Status