into bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb
client/mysqltest.c:
Auto merged
include/config-netware.h:
Auto merged
mysql-test/r/csv.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/csv.test:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
storage/csv/ha_tina.cc:
manual merge.
storage/innobase/btr/btr0btr.c:
SCCS merged
storage/innobase/buf/buf0buf.c:
SCCS merged
storage/innobase/dict/dict0dict.c:
SCCS merged
storage/innobase/fil/fil0fil.c:
SCCS merged
storage/innobase/fsp/fsp0fsp.c:
SCCS merged
storage/innobase/handler/ha_innodb.cc:
SCCS merged
storage/innobase/include/btr0cur.ic:
use local
storage/innobase/include/buf0buf.ic:
SCCS merged
storage/innobase/log/log0log.c:
SCCS merged
storage/innobase/log/log0recv.c:
SCCS merged
storage/innobase/os/os0file.c:
SCCS merged
storage/innobase/row/row0mysql.c:
SCCS merged
storage/innobase/row/row0sel.c:
SCCS merged
storage/innobase/srv/srv0start.c:
SCCS merged
storage/innobase/ut/ut0dbg.c:
SCCS merged
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
client/mysqldump.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Change things around so that we add a row for each log file group that lists
the free space for that log file group.
client/mysqldump.c:
dump logfile groups correctly (ignore row for the log file group itself)
mysql-test/r/ndb_dd_dump.result:
update results with new row for log file groups
sql/ha_ndbcluster.cc:
for fill_files_table:
- set null bits properly
- add rows for log file groups with free undo space.
sql/sql_show.cc:
make most I_S.FILES columns nullable to better fit with reality.
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/r/ndb_condition_pushdown.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
mysql-test/r/ndb_multi.result:
Merge
mysql-test/t/ndb_multi.test:
Merge
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
mysql-test/r/ndb_multi.result:
Auto merged
mysql-test/t/ndb_multi.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/r/ndb_condition_pushdown.result:
Auto merged
mysql-test/t/ndb_condition_pushdown.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
only NDB wanted that. Users and trainers complained that it affected
InnoDB and was a change compared to 4.1 where only NDB autocommitted.
To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
ha_ndbcluster::external_lock().
The result is that LOAD DATA INFILE commits all uncommitted changes
of NDB if this is an NDB table, its own changes if this is an NDB
table, but does not affect other engines.
Note: even though there is no "commit the full transaction at end"
anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
problems per a comment of Pem).
Note: ha_ndbcluster::has_transactions() does not give reliable results
because it says "yes" even if transactions are disabled in this engine...
sql/ha_ndbcluster.cc:
NDB wants to do autocommit if this is LOAD DATA INFILE.
For this to not affect all other engines, we move the logic
inside ha_ndbcluster.
sql/sql_load.cc:
This ha_enable_transaction() in mysql_load() forced an autocommit
in all engines, while only NDB wants to do that.
So we move the logic inside ha_ndbcluster.cc.
mysql-test/include/loaddata_autocom.inc:
test for engines to see if they autocommit or not in LOAD DATA INFILE
mysql-test/r/loaddata_autocom_innodb.result:
result for InnoDB (no autocommit)
mysql-test/r/loaddata_autocom_ndb.result:
result for NDB (autocommit)
mysql-test/r/rpl_ndb_innodb_trans.result:
result for InnoDB+NDB transactions. Observe that when ROLLBACK
cannot rollback the LOAD DATA INFILE in NDB it issues warning 1196
as appropriate.
mysql-test/t/loaddata_autocom_innodb.test:
test that InnoDB does not autocommit in LOAD DATA INFILE.
mysql-test/t/loaddata_autocom_ndb.test:
test that NDB does autocommit in LOAD DATA INFIL
mysql-test/t/rpl_ndb_innodb_trans-slave.opt:
need to tell the slave to use innodb
mysql-test/t/rpl_ndb_innodb_trans.test:
test of transactions mixing NDB and InnoDB. To see if ROLLBACK
rolls back in both engines, with the exception of LOAD DATA INFILE
which does not roll back NDB: we see that a LOAD DATA INFILE in NDB
commits all what has been done in NDB so far, commits its changes,
but does not commit in other engines.
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Merge
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
Merge
sql/ha_ndbcluster.cc:
Adding in new handlerton calls.
sql/handler.cc:
Calls directly made to NDB have been removed.
sql/handler.h:
Two additional handlerton structure functions.
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
Fixed "discover" in the handler API.
Fixed problem where handlerton was not zero'ed. I need to look around, I suspect this problem is more widespread.
sql/ha_innodb.h:
Unused variable
sql/ha_ndbcluster.cc:
Added "discover" to handlerton.
sql/handler.cc:
Added plugin loop and correctly now use handler API.
sql/handler.h:
Removed unused variable. Added discover to handler API
sql/mysqld.cc:
Removed unused variables.
sql/sql_plugin.cc:
Fixed DBUG Enter comment (obvious cut paste mistake)
storage/csv/ha_tina.cc:
Found that if we don't bzero handlerton, that things can go boom!
This probably needs to be fixed for all handlers
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
Plugins now when compiled or not compiled work correctly with status variables.
Status variables from plugins now set their own names (removed bit where plugin name was pre-appended this broke Innodb and Cluster)
A few Makefile cleanups.
sql/ha_innodb.cc:
Cleanup to make status variables directly in engine
sql/ha_ndbcluster.cc:
Engine interface now has variables for status
sql/handler.cc:
handler now makes sure to init status variables
sql/mysqld.cc:
Removed status variable hacks
sql/sql_delete.cc:
Removed include file that was not required
storage/myisam/Makefile.am:
Cleaned up line lengths and addded additional include to not install.
storage/myisam/ha_myisam.cc:
Removed double plugin include
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
mysql-test/t/disabled.def:
merge
sql/ha_ndbcluster.cc:
merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
mysql-test/t/disabled.def:
SCCS merged
sql/ha_ndbcluster.cc:
e
merge
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Merge
sql/ha_ndbcluster.cc:
Merge
sql/ha_ndbcluster.h:
Merge
bug #18184 SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
mysql-test/r/ndb_lock.result:
bug #18184 SELECT ... FOR UPDATE does not work..: New test case
mysql-test/t/ndb_lock.test:
bug #18184 SELECT ... FOR UPDATE does not work..: New test case
ndb/include/ndbapi/NdbConnection.hpp:
Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
sql/ha_ndbcluster.cc:
Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
sql/ha_ndbcluster.h:
Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
into mysql.com:/home/marty/MySQL/mysql-5.1-ndb
mysql-test/r/ndb_read_multi_range.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
mysql-test/r/ndb_lock.result:
Merge (using local)
sql/ha_ndbcluster.cc:
Merge fix for bug #18184 SELECT ... FOR UPDATE does not work..
sql/ha_ndbcluster.h:
Merge fix for bug #18184 SELECT ... FOR UPDATE does not work..
into mysql.com:/home/marty/MySQL/mysql-5.0
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.cc:
Merge
sql/ha_ndbcluster.cc:
bug #18184 SELECT ... FOR UPDATE does not work..: Added lockTuple call in closeScan
mysql-test/r/ndb_lock.result:
bug #18184 SELECT ... FOR UPDATE does not work..: Added lockTuple call in closeScan
mysql-test/t/ndb_lock.test:
bug #18184 SELECT ... FOR UPDATE does not work..: Added lockTuple call in closeScan
