summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
Commit message (Collapse)AuthorAgeFilesLines
* Bug#16795 ndb_cache_multi2unknown2006-02-271-1/+1
| | | | | | | | | | | | | | | | - Change && to || - Check for return value != 0 in "ndb->init()" mysql-test/r/ndb_cache_multi2.result: Update test result mysql-test/t/ndb_cache_multi2.test: Update test case - add printouts for what server the queries are from - Run the query from "while" once on server1 to cache it sql/ha_ndbcluster.cc: && => ||, to call both the function "thd->store_global()" and "ndb->init()" ndb_init returns 0 on sucess. Fail if not zero.
* ndb:unknown2006-02-131-1/+5
| | | | | | | | add optional reporting of of a "name" tied to a nodeid in the cluster log reporting added for mysql server and ndb_restore
* manual mergeunknown2006-02-101-2/+2
|
* Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2006-02-101-17/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 sql/ha_ndbcluster.h: Auto merged mysql-test/r/ndb_basic.result: manual merge mysql-test/t/ndb_basic.test: manual merge sql/ha_ndbcluster.cc: manual merge
| * Bug #17249 ndb, delete statement with join where clause fails when table do ↵unknown2006-02-101-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not have pk Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead mysql-test/r/ndb_basic.result: Bug #17249 delete statement with join where clause fails when table do not have pk Bug #17257 update fails for inner joins if tables do not have Primary Key mysql-test/t/ndb_basic.test: Bug #17249 delete statement with join where clause fails when table do not have pk Bug #17257 update fails for inner joins if tables do not have Primary Key sql/ha_ndbcluster.cc: Bug #17249 delete statement with join where clause fails when table do not have pk Bug #17257 update fails for inner joins if tables do not have Primary Key change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead sql/ha_ndbcluster.h: Bug #17249 delete statement with join where clause fails when table do not have pk Bug #17257 update fails for inner joins if tables do not have Primary Key change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
* | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-02-071-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my50 sql/ha_ndbcluster.cc: Auto merged
| * | ndb - bug#15918 fixunknown2006-02-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_index_unique.result: bug#15918 fix mysql-test/t/ndb_index_unique.test: bug#15918 fix ndb/src/kernel/blocks/dbacc/Dbacc.hpp: bug#15918 fix sql/ha_ndbcluster.cc: bug#15918 fix sql/ha_ndbcluster.h: bug#15918 fix
* | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2006-02-071-2/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 sql/ha_ndbcluster.cc: Auto merged
| * | Bug #17081 "LOAD DATA INFILE" may not load all the dataunknown2006-02-071-2/+5
| | |
* | | ndb, transaction should be refgistred even if m_transaction_on is not setunknown2006-02-071-4/+2
| | |
* | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2006-02-071-4/+18
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 sql/ha_ndbcluster.cc: Auto merged sql/sql_load.cc: Auto merged
| * Bug #17154 load data infile of char values into a table of char(PK) hangsunknown2006-02-071-4/+18
| | | | | | | | | | | | | | | | | | | | | | Bug #17158 load data infile of char values into table of char with no (PK) fails to load Bug #17081 Doing "LOAD DATA INFILE" directly after delete can cause missing data mysql-test/r/ndb_load.result: New BitKeeper file ``mysql-test/r/ndb_load.result'' mysql-test/t/ndb_load.test: New BitKeeper file ``mysql-test/t/ndb_load.test''
* | Merge mysql.com:/home/jimw/my/mysql-5.0-14212unknown2006-01-061-6/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged mysql-test/r/bdb.result: Resolve conflict mysql-test/t/bdb.test: Resolve conflict
| * | Fix crash in BDB from improper cleanup of transactions, and avoid problemunknown2005-12-091-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in NDB that the fix would cause due to improper registration of a transaction that isn't meant to be seen by the handler layer. (Bug #14212) Thanks to Sergei Golubchik for helping with this. mysql-test/r/bdb.result: Add new result mysql-test/t/bdb.test: Add new regression test sql/ha_ndbcluster.cc: Don't register transaction if transactions are "disabled". sql/handler.cc: Commit statement before trying to end transaction.
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-01-061-9/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0 mysql-test/r/create.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/trigger.test: Auto merged mysql-test/t/view.test: Auto merged sql/field.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/log_event.cc: Auto merged sql/opt_range.cc: Auto merged sql/sp.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/t/disabled.def: Manual merge sql/mysqld.cc: Manual merge sql/sp_head.cc: Manual merge sql/sql_trigger.cc: Manual merge
| * | | Review fixes of new pushed codeunknown2006-01-061-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed tests - Optimized new code - Fixed some unlikely core dumps - Better bug fixes for: - #14397 - OPTIMIZE TABLE with an open HANDLER causes a crash - #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null mysql-test/r/create.result: Update results after removing wrong warnings for CREATE ... SELECT New tests mysql-test/r/handler.result: Drop used tables mysql-test/r/kill.result: Make test portable mysql-test/r/mysqlshow.result: Drop tables used by previous test mysql-test/r/trigger.result: Reuse old procedure name mysql-test/r/view.result: Extra tests mysql-test/t/create.test: New tests to test fix of removing wrong warnings for CREATE ... SELECT mysql-test/t/disabled.def: Enable 'kill' test (should now be portable) mysql-test/t/handler.test: Drop used tables mysql-test/t/kill.test: Make test portable even if kill doesn't work at once mysql-test/t/mysqlshow.test: Drop tables used by previous test mysql-test/t/trigger.test: Reuse old procedure name mysql-test/t/view.test: Extra tests sql/field.cc: Removed compiler warning sql/ha_federated.cc: my_snprintf -> strmake() (Simple optimization) sql/ha_ndbcluster.cc: Indentation cleanups and trival optimization sql/item.cc: Moved save_org_in_field() to item.cc to make it easier to test Remove setting of null_value as this is not needed sql/item.h: Moved save_org_in_field() to item.cc to make it easier to test sql/log_event.cc: Remove inline of slave_load_file_stem() Added 'extension' parameter to slave_load_file_stem() to get smaller code Removed not critical (or needed) DBUG_ASSERT()'s Cleaned up usage of slave_load_file_stem() to not depend on constant string lengths Indentation fixes sql/opt_range.cc: Moved code from declaration to function body (To make it more readable) sql/parse_file.cc: Fixed DBUG_PRINT sql/sp.cc: Simple cleanups - Removed not needed {} level - Ensure saved variables starts with old_ sql/sp_head.cc: Indentation fixes Remove core dump when using --debug when m_next_cached_sp == 0 Fixed compiler warnings Trivial optimizations sql/sp_head.h: Changed argument to set_definer() to const Added THD argument to recursion_level_error() to avoid call to current_thd sql/sql_acl.cc: Removed not needed test (first_not_own_table is the guard) sql/sql_base.cc: Removed extra empty line sql/sql_handler.cc: Don't test table version in mysql_ha_read() as this is already tested in lock_tables() Moved call to insert_fields to be after lock_table() to guard aganst reopen of tables (Better fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash) sql/sql_insert.cc: Mark fields that are set in CREATE ... SELECT as used (Removed wrong warnings about field not having a default value) sql/sql_parse.cc: Removed not needed test of 'tables' (first_not_own_table is the guard) Simplify code sql/sql_select.cc: Use group->field to check if value is null instead of item called by 'save_org_in_field' This is a better bug fix for #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null) sql/sql_trigger.cc: Move sql_modes_parameters outside of function Indentation fixes Fixed compiler warning Ensure that thd->lex->query_tables_own_last is set properly before calling check_table_access() (This allows us to remove the extra test in check_grant() and check_table_access())
* | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-12-141-2/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push mysql-test/r/ndb_basic.result: Auto merged mysql-test/t/ndb_basic.test: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged ndb/src/kernel/vm/SimulatedBlock.cpp: merge
| * | | | bug#15682 - ndb - invalid handling of varchar in position/rnd_posunknown2005-12-141-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_basic.result: bug#15682 - invalid handling of varchar in position/rnd_pos mysql-test/t/ndb_basic.test: bug#15682 - invalid handling of varchar in position/rnd_pos ndb/src/kernel/blocks/dbtc/Dbtc.hpp: New error code for invalid key ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Handle invalid key gracefully ndb/src/kernel/vm/SimulatedBlock.cpp: Handle invalid key gracefully ndb/src/ndbapi/ndberror.c: New error code sql/ha_ndbcluster.cc: Fix varchar keys in position/rnd_pos
* | | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2005-11-251-10/+12
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-241-6/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 sql/ha_ndbcluster.cc: Auto merged
| | * | | Moved check of wrong schema version earlierunknown2005-11-241-6/+8
| | | | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-211-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1 sql/ha_ndbcluster.cc: Auto merged
| | * | | 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
* | | | | Using new error code HA_ERR_TABLE_DEF_CHANGED to signal wrong schema version ↵unknown2005-11-181-2/+1
| | | | | | | | | | | | | | | | | | | | of table
* | | | | Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1unknown2005-11-171-5/+39
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 mysql-test/r/ndb_alter_table.result: Auto merged mysql-test/t/ndb_alter_table.test: Auto merged sql/ha_ndbcluster.cc: Merge
| * | | | Fixed incorrectly use if table with wrong schema versionunknown2005-11-171-5/+39
| |/ / /
* | | | Fixes during review of new codeunknown2005-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroy LOCK_uuid_generator sql/ha_berkeley.h: Fix portability problem (warnings from gcc on 32 bit linux) sql/ha_ndbcluster.cc: Fixed portability problem sql/mysqld.cc: Destroy LOCK_uuid_generator
* | | | 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
* | | | This patch add support for storing Geometry types to Archive, Innodb, NDB, ↵unknown2005-10-241-2/+4
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and BDB. sql/ha_archive.h: Adding support for Geometry type to archive. sql/ha_berkeley.cc: Adding geometry support to berkely sql/ha_innodb.cc: Adding geometry support to Innodb. sql/ha_ndbcluster.cc: Adding Geometry support to NDB. mysql-test/include/gis_generic.inc: New BitKeeper file ``mysql-test/include/gis_generic.inc'' mysql-test/r/archive_gis.result: New BitKeeper file ``mysql-test/r/archive_gis.result'' mysql-test/r/bdb_gis.result: New BitKeeper file ``mysql-test/r/bdb_gis.result'' mysql-test/r/ndb_gis.result: New BitKeeper file ``mysql-test/r/ndb_gis.result'' mysql-test/t/archive_gis.test: New BitKeeper file ``mysql-test/t/archive_gis.test'' mysql-test/t/bdb_gis.test: New BitKeeper file ``mysql-test/t/bdb_gis.test'' mysql-test/t/innodb_gis.test: New BitKeeper file ``mysql-test/t/innodb_gis.test'' mysql-test/t/ndb_gis.test: New BitKeeper file ``mysql-test/t/ndb_gis.test''
* | | Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1unknown2005-10-141-15/+13
|\ \ \ | |/ / | | / | |/ |/| | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 sql/ha_ndbcluster.cc: merge
| * Fix for Bug #13961 Triggers on tables with auto_increment insert bogus ↵unknown2005-10-141-14/+16
| | | | | | | | values into table (clean version)
| * Fixed gcc error on AMD64: cast from 'char*' to 'unsigned int' loses precisionunknown2005-09-261-2/+2
| |
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-121-4/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0 mysql-test/r/view.result: Auto merged mysql-test/t/view.test: Auto merged server-tools/instance-manager/instance.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/slave.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_manager.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/table.cc: Auto merged sql/unireg.cc: Auto merged
| * | Reviewing new pushed codeunknown2005-10-121-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CHAR() now returns binary string as default - CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR() - Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() (Some old systems returns ETIME and it's safer to test for both values than to try to write a wrapper for each old system) - Fixed new introduced bug in NOT BETWEEN X and X - Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed - Use octet2hex() for all conversion of string to hex - Simplify and optimize code client/mysqldump.c: Simple optimizations of new code Indentation fixes client/mysqltest.c: Removed not needed variable include/mysql_com.h: Made octec2hex() more usable mysql-test/r/ctype_utf8.result: CHAR() now returns binary string as default mysql-test/r/func_str.result: CHAR() now returns binary string as default mysql-test/r/range.result: Added test to verify new introduced bug in NOT BETWEEN X and X mysql-test/r/user_var-binlog.result: CHAR() now returns binary string as default mysql-test/r/view.result: More tests of view rename mysql-test/t/ctype_utf8.test: CHAR() now returns binary string as default mysql-test/t/func_str.test: CHAR() now returns binary string as default mysql-test/t/range.test: Added test to verify new introduced bug in NOT BETWEEN X and X mysql-test/t/view.test: More tests of view rename mysys/mf_keycache.c: Indentation changes Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() mysys/my_os2cond.c: Fix to MySQL coding style Optimized functions mysys/thr_lock.c: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() mysys/thr_mutex.c: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() server-tools/instance-manager/instance.cc: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() server-tools/instance-manager/thread_registry.cc: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() sql/ha_federated.cc: Use octet2hex() sql/ha_ndbcluster.cc: Removed not used variable sql/handler.cc: Simplify code Use *NONE* instead of 'none' for not existing storage engine Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed sql/item.h: Remove not needed test for *ref. (If ref is set, it should never point at 0) sql/item_func.cc: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() Simplify code More comments Require that last argument to find_and_check_access() is given (Made code shorter and faster) sql/item_strfunc.cc: Changed CHAR() to return result in binary collation CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR() Bar will shortly add the following syntax: CHAR(.... USING character_set) and ensure that CONVERT(CHAR(....) USING utf8) cuts not legal utf8 strings Use ocet2hex() sql/item_strfunc.h: CHAR() now returns a binary string sql/log_event.cc: Use octet2hex() Simplify code sql/parse_file.cc: Indentation fixes Use for() instead of while() sql/password.c: Make octet2hex() more generally usable by returning pointer to end 0 sql/slave.cc: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() sql/sql_base.cc: Indentation fixes sql/sql_insert.cc: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() sql/sql_manager.cc: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() sql/sql_parse.cc: Don't check thd->db when checking for function privileges sql/sql_prepare.cc: Fixed wrong merge sql/sql_select.cc: Fixed new bug for NOT BETWEEN X and X sql/sql_show.cc: Removed not used variable sql/sql_table.cc: Indentation fixed Removed DBUG_PRINT that is obvious from context sql/sql_view.cc: Simplify code sql/unireg.cc: Use octet2hex()
* | | pthread_handler_decl() changed to be ctags-friendlyunknown2005-10-081-3/+2
|/ / | | | | | | | | | | | | (and contain extern "C" when necessary)
* | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-031-5/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Final patch for 5.0 for simplifying storage engine code. We now have just ↵unknown2005-10-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-021-5/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Next big patch for loadable storage engines!unknown2005-10-021-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Mergeunknown2005-09-301-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | sql/ha_ndbcluster.cc: SCCS merged sql/handler.h: SCCS merged
| * | | Bug#11238unknown2005-09-301-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | "SELECT ... FOR UPDATE executed as consistent read inside LOCK TABLES" Do not discard lock_type information as handler::start_stmt() may require knowledge. (fixed by Antony)
* | | BUG#13081: Disable ROR-index_merge for NDB tables (by adding a unknown2005-09-301-1/+2
|/ / | | | | | | | | | | | | | | HA_KEY_SCAN_NOT_ROR index flag) as NDB index scans are not guaranteed to be ROR scans.
* | ndb post merge fixes (show engine ndb status)unknown2005-09-211-1/+1
| | | | | | | | | | sql/ha_ndbcluster.cc: ndb post merge fixes
* | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push sql/ha_ndbcluster.cc: Auto merged
| * | Cleanup for handlerton structure to allow for loadable engine work. This is ↵unknown2005-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the first in a series of patches. sql/examples/ha_archive.cc: Now declared externally. sql/examples/ha_example.cc: Now declared externally sql/examples/ha_tina.cc: Now declared externally sql/ha_berkeley.cc: Now declared externally sql/ha_blackhole.cc: Now declared externally sql/ha_federated.cc: Now declared externally. sql/ha_heap.cc: Now declared externally. sql/ha_innodb.cc: Now declared externally. sql/ha_myisam.cc: Now declared externally sql/ha_myisammrg.cc: Now declared externally. sql/ha_ndbcluster.cc: Now declared externally. sql/handler.cc: Changes for eventual loadable engines. This will allow us to gain faster access to the handlerton (eventually this will just be a handlteron array). sql/handler.h: New alias structure and change to show_table_st to place handlerton in the structure.
* | | ndb - post merge fixesunknown2005-09-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/ndbapi/NdbTransaction.hpp: post merge fixes ndb/src/ndbapi/Ndblist.cpp: post merge fixes sql/ha_ndbcluster.cc: post merge fixes
* | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1unknown2005-09-201-0/+46
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 ndb/include/ndbapi/NdbBlob.hpp: Auto merged ndb/include/ndbapi/NdbOperation.hpp: Auto merged ndb/include/ndbapi/NdbRecAttr.hpp: Auto merged ndb/src/ndbapi/NdbApiSignal.cpp: Auto merged ndb/src/ndbapi/NdbApiSignal.hpp: Auto merged ndb/src/ndbapi/NdbBlob.cpp: Auto merged ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged ndb/src/ndbapi/Ndbif.cpp: Auto merged ndb/src/ndbapi/Ndbinit.cpp: Auto merged ndb/test/include/NDBT_Test.hpp: Auto merged ndb/test/ndbapi/bank/BankLoad.cpp: Auto merged ndb/test/ndbapi/testOIBasic.cpp: Auto merged ndb/test/src/NdbBackup.cpp: Auto merged ndb/test/src/NdbRestarts.cpp: Auto merged ndb/tools/restore/Restore.cpp: Auto merged sql/ha_ndbcluster.h: Auto merged sql/sql_yacc.yy: Auto merged ndb/include/ndbapi/Ndb.hpp: merge ndb/include/ndbapi/NdbIndexOperation.hpp: merge ndb/include/ndbapi/NdbIndexScanOperation.hpp: merge ndb/include/ndbapi/NdbTransaction.hpp: merge ndb/src/ndbapi/NdbImpl.hpp: merge ndb/src/ndbapi/Ndblist.cpp: merge ndb/test/src/HugoCalculator.cpp: merge ndb/test/src/NDBT_Test.cpp: merge sql/ha_ndbcluster.cc: merge sql/mysqld.cc: merge sql/sql_lex.h: merge sql/sql_parse.cc: merge
| * ndb - imlp. show engine ndb status;unknown2005-09-191-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that dump free list allocation per connection sql/ha_ndbcluster.cc: imlp. show engine ndb status; that dump free list allocation per connection sql/ha_ndbcluster.h: imlp. show engine ndb status; that dump free list allocation per connection sql/mysqld.cc: imlp. show engine ndb status; that dump free list allocation per connection sql/sql_lex.h: imlp. show engine ndb status; that dump free list allocation per connection sql/sql_parse.cc: imlp. show engine ndb status; that dump free list allocation per connection sql/sql_yacc.yy: imlp. show engine ndb status; that dump free list allocation per connection
| * Merge eel.(none):/home/jonas/src/mysql-4.1unknown2005-08-181-1/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-4.1-push mysql-test/t/ndb_config.test: Auto merged ndb/src/common/util/version.c: Auto merged ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/ndbapi/TransporterFacade.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged mysql-test/t/ndb_alter_table.test: merge
| * \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-101-0/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 sql/ha_ndbcluster.cc: Auto merged
View Lorry Controller Status