summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1unknown2006-01-121-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 client/mysqlimport.c: Auto merged include/config-netware.h: Auto merged innobase/os/os0thread.c: Auto merged netware/mysqld_safe.c: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysqld.cc: Merged from 4.1. sql/sql_base.cc: Merged from 4.1. sql/sql_handler.cc: Merged from 4.1. sql/sql_select.cc: Merged from 4.1.
| * Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0unknown2006-01-121-0/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 include/config-netware.h: Auto merged innobase/os/os0thread.c: Auto merged netware/mysqld_safe.c: Merge from 4.0 to 4.1 sql/mysqld.cc: Merge from 4.0 to 4.1
| | * NetWare specific change to increase thread stack size.unknown2006-01-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to Netware specific mysqld_safe.c include/config-netware.h: NetWare specific change to increase thread stack size. innobase/os/os0thread.c: NetWare specific change to increase thread stack size. netware/mysqld_safe.c: NetWare specific change to make multiple mysqld_safe instances work when called through a NCF file. sql/mysqld.cc: NetWare specific change to increase thread stack size.
* | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-111-9/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into linux.site:/home/reggie/work/mysql-5.0
| * | | simple Windows compile fixes.unknown2006-01-111-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/config-win.h: use the ll and ull postfix codes for create longlong and ulonglong symbols. This allows ULL(a) and LL(a) to be used in more complex macro definitions than the previous definitions. This may work on other compilers but we just tested on Visual 7.1 and 8.0 Also, define HAVE_STRNLEN for all windows platforms. Our own strnlen offers no performance improvements over the CRT version.
* | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2006-01-111-3/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root sql/item_strfunc.cc: Auto merged sql/password.c: Manual merge
| * | | A fix for Bug#13944 "libmysqlclient exporting sha1_result function":unknown2006-01-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rename sha1_* to mysql_sha1_* include/sha1.h: rename sha1_* to mysql_sha1_* mysys/sha1.c: rename sha1_* to mysql_sha1_* sql/item_strfunc.cc: rename sha1_* to mysql_sha1_* sql/password.c: rename sha1_* to mysql_sha1_*
* | | | Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clauseunknown2006-01-113-1/+45
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two main idea of this fix: - introduce a common function for server and client to split user value (<user name>@<host name>) into user name and host name parts; - dump DEFINER clause in correct format in mysqldump. BitKeeper/etc/ignore: added client/my_user.c libmysqld/my_user.c sql/my_user.c client/Makefile.am: Use my_user.c in linking of mysqldump executable. client/mysqldump.c: Fix for BUG#15110(mysqldump --triggers: does not include DEFINER clause) include/Makefile.am: Add my_user.c include/mysql_com.h: Introduce a constant for max user length. libmysqld/Makefile.am: Add my_user.c mysql-test/r/mysqldump.result: Update result file. sql-common/Makefile.am: Add my_user.c sql/Makefile.am: Add my_user.c sql/sp.cc: Use constant for max user length. sql/sp_head.cc: Use common function to parse user value. sql/sql_acl.cc: Use constant for max user length. sql/sql_parse.cc: Use constant for max user length. sql/sql_show.cc: Use constant for max user length. sql/sql_trigger.cc: Use constant for max user length. include/my_user.h: A header file for parse_user(). sql-common/my_user.c: A new file for parse_user() implementation.
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-091-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
| * | | Add yassl libs to libmysqlclient_r as well.unknown2006-01-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl Similiar to readline) config/ac-macros/yassl.m4: Symlink extra/yassl/include/openssl dir to include/ include/Makefile.am: Call yassl_h_ln_cmd when linking sources, this will create symlink to openssl in include when compiling with yassl libmysql_r/Makefile.am: Inlude yassl libs into libmysqlclient_r(just as we do in libmysqlclient)
* | | | Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixesunknown2006-01-051-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/mysql-5.0 include/config-win.h: Auto merged
| * | | | Port to Win64/x64 in Visual Studio 2005unknown2006-01-051-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/config-win.h: Port to Win64/x64 in Visual Studio 2005. Avoid endless deprecation warnings.
* | | | | Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixesunknown2006-01-051-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/mysql-5.0
| * | | | EADDRINUSE is not defined on Windows.unknown2006-01-041-0/+3
| |/ / /
* | | | Merge mysql.com:/opt/local/work/mysql-4.1-7209-newunknown2006-01-041-4/+10
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-merge mysys/hash.c: Auto merged ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: Auto merged sql/lock.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_acl.cc: Manual merge. sql/sql_base.cc: Manual merge.
| * | | A fix for Bug#7209 "Client error with "Access Denied" on updates unknown2006-01-041-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when high concurrency": remove HASH::current_record and make it an external search parameter, so that it can not be the cause of a race condition under high concurrent load. The bug was in a race condition in table_hash_search, when column_priv_hash.current_record was overwritten simultaneously by multiple threads, causing the search for a suitable grant record to fail. No test case as the bug is repeatable only under concurrent load. include/hash.h: - remove current_record from HASH, instead modify hash_first, hash_next to accept HASH_SEARCH_STATE as an IN/OUT parameter mysys/hash.c: - remove HASH::current_record - change declarations of functions that use HASH in read-only mode to accept const HASH * instead of HASH *. - implement hash_search; move the old implementation of hash_search to hash_first mysys/testhash.c: - adjust the test case to changed function declarations sql/lock.cc: - adjust to changed declarations of hash_search, hash_next sql/sql_acl.cc: - adjust to changed declarations of hash_search, hash_next sql/sql_base.cc: - adjust to changed declarations of hash_search, hash_nex sql/sql_cache.cc: - adjust to a changed declaration of hash_replace
* | | | Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0unknown2005-12-291-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | config-win.h:unknown2005-12-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported Windows MAX_INDEXES handling from 5.1 include/config-win.h: Backported Windows MAX_INDEXES handling from 5.1
* | | | remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably ↵unknown2005-12-241-1/+2
|/ / / | | | | | | | | | | | | | | | | | | scattered all over the source include/config-netware.h: put undef HAVE_ARCHIVE_DB where it belongs
* | | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-142-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0
| * \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2005-12-131-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-5.0-release
| | * | | Fix for bug#15209: MySQL installation problem on Windows ME.unknown2005-12-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/config-win.h: Fix for bug#15209: MySQL installation problem on Windows ME. - set FILE_SHARE_DELETE to 0 as it's not implemented on Win98/ME (my_sopen() fails)
| * | | | my_pthread.h:unknown2005-12-131-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#15629: Increased thread stack for all 64 bit platforms, else test case 'sp' and 'call fib(20)' gives stack overrun include/my_pthread.h: Bug#15629: Increased thread stack for all 64 bit platforms, else test case 'sp' and 'call fib(20)' gives stack overrun
* | | | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-071-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-bug10932 configure.in: Auto merged sql/mysql_priv.h: Auto merged
| * | | compatibility define for Bug#15293unknown2005-12-051-0/+3
| | | |
* | | | Merge mysql.com:/home/mydev/mysql-5.0unknown2005-12-061-5/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-bug10932 configure.in: Auto merged sql/mysql_priv.h: Auto merged sql/unireg.h: Auto merged
| * | | Bug#10932 - Building server with key limit of 128, makes test cases failunknown2005-12-021-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow for configuration of the maximum number of indexes per table. Added and used a configure.in macro. Replaced fixed limits by the configurable limit. Limited MyISAM indexes to its hard limit. Fixed a bug in opt_range.cc for many indexes with InnoDB. Tested for 2, 63, 64, 65, 127, 128, 129, 255, 256, and 257 indexes. Testing this part of the bugfix requires rebuilding of the server with different options. This cannot be done with our test suite. Therefore I added the necessary test files to the bug report. If you repeat the tests, please note that the ps_* tests fail for everything but 64 indexes. This is because of differences in the meta data, namely field lengths for index names etc. config/ac-macros/misc.m4: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Added a macro for the new build option. configure.in: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Added a call for the new macro. include/myisam.h: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Limit the number of keys for MyISAM to its hard limit. sql/mysql_priv.h: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Stick with the optimized Bitmap<64> if indexes are limited to 64 or lower. Otherwise use a bigger bitmap. It must be defined as a multiple of 8. sql/opt_range.cc: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Initialize an object element to avoid a crash when using InnoDB with many indexes. sql/unireg.h: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Replace the fixed limit by the configurable limit. tests/mysql_client_test.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Allow for configuration of the maximum number of indexes per table. Replace the fixed limit by the configurable limit.
* | | | my_global.h:unknown2005-12-031-0/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | Make __cxa_pure_virtual weak symbol include/my_global.h: Make __cxa_pure_virtual weak symbol
* | | Merge mysqldev@production:my/mysql-4.1.16-fixesunknown2005-11-281-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/mysql-5.0 include/config-win.h: Auto merged sql/log_event.cc: Discard 4.1 win32 compile fix that was already in 5.0.
| * | Minor Win32 compile fixes for 4.1.16 release.unknown2005-11-281-4/+4
| | | | | | | | | | | | | | | | | | | | | sql/log_event.cc: Add missing cast needed for Win32 compilation. include/config-win.h: Win32 compile fix: quote multi-line macros with do { ... } while(0) to follow earlier changes in my_global.h.
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-261-9/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0 include/my_base.h: Auto merged
| * | | documenting HA_STATUS_xxx flagsunknown2005-11-261-9/+42
| | | |
* | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2005-11-251-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root mysql-test/r/ndb_alter_table.result: Auto merged mysql-test/r/ndb_basic.result: Auto merged mysql-test/t/select.test: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/table.cc: Auto merged vio/vio.c: Auto merged vio/viossl.c: Auto merged include/my_base.h: Manual merge. mysql-test/r/ps.result: Manual merge. mysql-test/r/select.result: Manual merge. mysql-test/t/ndb_alter_table.test: Manual merge. mysql-test/t/ndb_basic.test: Manual merge. mysql-test/t/ps.test: Manual merge. sql-common/client.c: k sql/ha_ndbcluster.cc: Manual merge. sql/item.cc: Manual merge. sql/sql_table.cc: Manual merge.
| * | Bug #14514 Creating table with packed key fails silentlyunknown2005-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Backport from 5.0 include/my_base.h: Rename HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE, ie. it's a bit in the table_options variable mysql-test/r/ndb_basic.result: Add test result mysql-test/t/ndb_basic.test: Add test case for bug14514 sql/ha_ndbcluster.cc: Use new bitmask for table_options to detect if create from engine sql/handler.cc: Use new bit for create from engine
* | | 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
* | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-191-8/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck configure.in: Auto merged
| * \ \ Mergeunknown2005-11-041-8/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile.am: Auto merged client/Makefile.am: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged netware/Makefile.am: Auto merged support-files/Makefile.am: Auto merged
| | * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-041-12/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck Makefile.am: Auto merged configure.in: Auto merged mysql-test/Makefile.am: Auto merged
| | | * | Makefile.am, configure.in:unknown2005-09-241-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable "make distcheck" to work configure.in: Enable "make distcheck" to work Docs/Makefile.am: Enable "make distcheck" to work Makefile.am: Enable "make distcheck" to work client/Makefile.am: Enable "make distcheck" to work cmd-line-utils/libedit/Makefile.am: Enable "make distcheck" to work include/Makefile.am: Enable "make distcheck" to work libmysql/Makefile.am: Enable "make distcheck" to work libmysql_r/Makefile.am: Enable "make distcheck" to work libmysqld/Makefile.am: Enable "make distcheck" to work libmysqld/examples/Makefile.am: Enable "make distcheck" to work mysql-test/Makefile.am: Enable "make distcheck" to work ndb/docs/Makefile.am: Enable "make distcheck" to work netware/Makefile.am: Enable "make distcheck" to work pstack/Makefile.am: Enable "make distcheck" to work scripts/Makefile.am: Enable "make distcheck" to work sql-bench/Makefile.am: Enable "make distcheck" to work sql/Makefile.am: Enable "make distcheck" to work sql/share/Makefile.am: Enable "make distcheck" to work support-files/Makefile.am: Enable "make distcheck" to work
* | | | | Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crashunknown2005-11-151-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version for 5.0. It fixes three problems: 1. The cause of the bug was that we did not check the table version for the HANDLER ... READ commands. We did not notice when a table was replaced by a new one. This can happen during ALTER TABLE, REPAIR TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix for this problem "the primary bug fix". 2. mysql_ha_flush() was not always called with a locked LOCK_open. Though the function comment clearly said it must. I changed the code so that the locking is done when required. I call the fix for this problem "the secondary fix". 3. In 5.0 (not in 4.1 or 4.0) DROP TABLE had a possible deadlock flaw in concur with FLUSH TABLES WITH READ LOCK. I call the fix for this problem "the 5.0 addendum fix". include/my_pthread.h: Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash Added a new macro for the 5.0 addendum fix. mysql-test/r/handler.result: Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash The test result. mysql-test/t/handler.test: Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash The test case. sql/lock.cc: Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash Changed a comment which did confuse me and which is not fully correct anymore after the 5.0 addendum fix. Added an assertion which would fire without the 5.0 addendum fix. sql/mysql_priv.h: Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash Changed a definition for the secondary fix. sql/sql_base.cc: Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash Changed function calls for the secondary fix. sql/sql_class.cc: Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash Changed a function call for the secondary fix. sql/sql_handler.cc: Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash The first two diffs make the primary bug fix. The rest is for the secondary fix. sql/sql_table.cc: Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash The first diff (four changed places) make the 5.0 addendum fix. The other three are changed function calls for the secondary fix.
* | | | | Merge selena.:H:/MYSQL/bkt/mysql-5.0-relunknown2005-11-141-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into selena.:H:/MYSQL/bkt/mysql-5.0
| * | | | | config-win.h:unknown2005-11-141-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled yaSSL support for now include/config-win.h: Disabled yaSSL support for now
* | | | | Fixes bug #13377. my_open() & my_create() functions changed to use unknown2005-11-142-0/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | BUG#14514 Creating table with packed key fails silentlyunknown2005-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_base.h: Move HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE sql/ha_ndbcluster.cc: Use HA_OPTION_CREATE_FROM_ENGINE sql/handler.cc: Use HA_OPTION_CREATE_FROM_ENGINE
* | | | 4.1->5.0 mergeunknown2005-10-291-4/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/config-netware.h: Merged innobase/row/row0ins.c: BUG#10511: Per alexi's instructions, the changes in innobase/row/row0ins.c are not propagated to 5.x mysql-test/r/create.result: Auto Merged mysql-test/t/create.test: Auto Merged sql/field.cc: Auto Merged sql/field.h: Manual Merge sql/sql_table.cc: Auto Merged
| * | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0unknown2005-10-281-4/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 include/config-netware.h: Auto merged
| | * | NetWare specific change to use a LibC API instead of aunknown2005-10-281-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | kernel function to prevent CPU hogs.
| | * | Imported fixes from 4.1 and 5.0 to 4.0.unknown2005-10-251-0/+4
| | | |
* | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
| * | | | Makefile.am:unknown2005-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added "base64.h" to enable "make dist" to work include/Makefile.am: Added "base64.h" to enable "make dist" to work
View Lorry Controller Status