Commit graph

22228 commits

Author SHA1 Message Date
mskold/marty@quadfish.(none)
e051994b10 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
2007-12-07 10:46:12 +01:00
mskold/marty@mysql.com/quadfish.(none)
fc6f839b03 bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes 2007-12-07 10:33:50 +01:00
mskold/marty@mysql.com/quadfish.(none)
27c025061d bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts 2007-12-06 17:15:21 +01:00
mskold/marty@quadfish.(none)
1f244fad80 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
2007-11-20 14:37:36 +01:00
tomas@whalegate.ndb.mysql.com
0feaff83b7 only potentially skip GAP event on startup, not on cluster restart 2007-11-06 22:28:44 +01:00
tomas@whalegate.ndb.mysql.com
312aec9e27 Bug #31484 Cluster LOST_EVENTS entry not added to binlog on mysqld restart
- correction, do not insert GAP on first startup
2007-11-06 15:12:27 +01:00
mskold/marty@mysql.com/quadfish.(none)
56ab11c8cb ndb_auto_increment.result:
Rename: mysql-test/r/ndb_auto_increment.result -> mysql-test/suite/ndb/r/ndb_auto_increment.result
ndb_auto_increment.test, ndb_auto_increment.result:
  Bug #31956       auto increment bugs in MySQL Cluster: Adapted test cases
ha_ndbcluster.cc:
  Bug #31956       auto increment bugs in MySQL Cluster: Merging from 5.0
ndb_auto_increment.test:
  Rename: mysql-test/t/ndb_auto_increment.test -> mysql-test/suite/ndb/t/ndb_auto_increment.test
2007-11-06 10:57:49 +01:00
mskold/marty@mysql.com/quadfish.(none)
022b835c67 Removed compiler warnings 2007-11-06 10:28:11 +01:00
tomas@whalegate.ndb.mysql.com
47a245559c break out tuple data read 2007-11-06 10:27:56 +01:00
tomas@whalegate.ndb.mysql.com
bfc80edec5 preserve more of the state 2007-11-05 23:23:26 +01:00
mskold/marty@quadfish.(none)
310d592392 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
2007-11-05 22:41:20 +01:00
mskold/marty@quadfish.(none)
b5dc9abbf0 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
2007-11-05 21:11:15 +01:00
mskold/marty@mysql.com/quadfish.(none)
4cf742a8a8 ha_ndbcluster.h:
Bug #31956       auto increment bugs in MySQL Cluster: Added utility method and constant for internal prefetch default
ndb_auto_increment.result:
  BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/r/ndb_auto_increment.result
mysqld.cc:
  Bug #25176  	Trying to set ndb_autoincrement_prefetch_sz always fails: Changed pointer to max value
  Bug #31956  	auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement)
ndb_insert.test, ndb_insert.result:
  Moved auto_increment tests to ndb_auto_increment.test
ndb_auto_increment.test:
  BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/t/ndb_auto_increment.test
ha_ndbcluster.cc:
  Bug #31956       auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement), added handling of updates of pk/unique key with auto_increment
  Bug #32055  	Cluster does not handle auto inc correctly with insert ignore statement
2007-11-05 20:18:22 +01:00
tomas@whalegate.ndb.mysql.com
2635cb0a93 compile error 2007-11-03 13:46:49 +01:00
tomas@whalegate.ndb.mysql.com
96dfac7cb1 this error should not be printed 2007-11-02 23:44:17 +01:00
tomas@whalegate.ndb.mysql.com
9952ee4f91 Bug #31484 Cluster LOST_EVENTS entry not added to binlog on mysqld restart
- correction
2007-11-01 20:00:44 +01:00
tomas@whalegate.ndb.mysql.com
9320ec8d16 Bug #31484 Cluster LOST_EVENTS entry not added to binlog on mysqld restart. 2007-11-01 15:08:00 +01:00
tomas@whalegate.ndb.mysql.com
93c95156bc correct unused code 2007-10-26 11:43:05 +02:00
knielsen@loke.(none)
bb6346fd02 Merge loke.(none):/home/knielsen/devel/mysql-5.0-ndb
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
2007-10-25 11:00:36 +02:00
knielsen@loke.(none)
b77f44c76d Merge loke.(none):/home/knielsen/devel/bug31810
into  loke.(none):/home/knielsen/devel/mysql-5.0-ndb
2007-10-25 10:54:23 +02:00
knielsen@loke.(none)[knielsen]
e16f03cd64 BUG#31810: Potential infinite loop with autoincrement failures in ndb
Fix extra semicolon causing if-statement to be disabled.
2007-10-25 08:40:42 +02:00
mskold/marty@linux.site
4785c57334 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-10-24 14:07:33 +02:00
mskold/marty@linux.site
f92959dea5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-10-15 08:51:35 +02:00
pekka@sama.ndb.mysql.com
f83a1beb71 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390
2007-10-09 13:16:49 +02:00
tomas@whalegate.ndb.mysql.com
7453382acf Bug #31470 ndb table with special characters in name are not discovered correctly 2007-10-09 09:39:39 +02:00
pekka@sama.ndb.mysql.com
3dea240a6c Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390
2007-10-04 18:37:49 +02:00
pekka@sama.ndb.mysql.com
82da7623d4 ndb - bug#29390: if ScanFilter is too large, abort or optionally discard it 2007-10-04 11:32:49 +02:00
mskold/marty@mysql.com/linux.site
c91d8068d1 Bug#25817 UPDATE IGNORE doesn't check write_set when checking unique indexes: Post merge 5.0->5.1 2007-10-03 09:54:33 +02:00
mskold/marty@mysql.com/linux.site
94e7bf9f4b Removed tabs 2007-10-03 09:29:10 +02:00
mskold/marty@linux.site
a26772ca21 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-10-02 14:23:59 +02:00
mskold/marty@mysql.com/linux.site
403f0afc29 Bug#25817 UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks 2007-10-02 13:36:13 +02:00
tomas@whalegate.ndb.mysql.com
132dba0020 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-10-02 11:38:14 +02:00
tomas@whalegate.ndb.mysql.com
db5771557c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-09-27 19:11:47 +02:00
mats@kindahl-laptop.dnsalias.net
983de3e27c Merge kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-rpl
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-release
2007-09-24 10:53:41 +02:00
mats@kindahl-laptop.dnsalias.net
b2f5b2e83d BUG#31076 (Server crashes when start slave is issued):
Second patch to initailize more uninitialized variables.
2007-09-24 10:50:57 +02:00
mats@kindahl-laptop.dnsalias.net
8aa3bb0418 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-release
into  kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-release
2007-09-20 16:38:36 +02:00
mats@kindahl-laptop.dnsalias.net
c5622b424f BUG#31076 (Server crashes when start slave is issued):
Row-based replication crashes when replicating from pre-5.1.22 to 5.1.22
due to an uninitialized variable.
2007-09-20 16:31:05 +02:00
mikael@dator6.(none)
f09169670b Fixed ndbcluster_rollback 2007-09-15 23:33:04 +02:00
gkodinov/kgeorge@magare.gmz
dc02820236 Bug #31001: ORDER BY DESC in InnoDB not working
The optimizer sets index traversal in reverse order only if there are 
used key parts that are not compared to a constant.
However using the primary key as an ORDER BY suffix rendered the check
incomplete : going in reverse order must still be used even if 
all the parts of the secondary key are compared to a constant.

Fixed by relaxing the check and set reverse traversal even when all
the secondary index keyparts are compared to a const.
Also account for the case when all the primary keys are compared to a
constant.
2007-09-14 18:20:17 +03:00
tomas@whalegate.ndb.mysql.com
83cc4e8d2e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-09-14 11:52:59 +02:00
mikael@dator6.(none)
0f18ff3350 BUG#30996: Committed too early when autocommit and lock table
Moved out a lot of code into functions from external_lock and
start_stmt
Fixed a crashing bug at memory alloc failure
Merged the stmt and all variables into one trans variable
Always register start of statement as according to the
interface of the handlers.
Also register for start of transaction when not statement commit
== not autocommit AND no begin - commit ongoing
Now that we registered in a proper manner we also needed to handle
the commit call when end of statement and transaction is ongoing
Added start_stmt_count to know when we have start of statement
for first table
2007-09-14 00:10:47 +02:00
mskold/marty@linux.site
f2159e2d21 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-09-13 10:35:11 +02:00
mskold/marty@linux.site
d4e84e13b0 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-09-13 10:06:42 +02:00
mskold/marty@linux.site
2ea6d3d680 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-09-13 10:00:14 +02:00
mskold/marty@mysql.com/linux.site
44b6c2edad bug#27494 An invalid subselect crashes mysql server: Added check for missing arguments 2007-09-13 09:47:21 +02:00
tomas@whalegate.ndb.mysql.com
63648db422 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
2007-09-12 13:55:45 +02:00
antony@pcg5ppc.xiphis.org
89f88eab6e Bug#30919
"Rows not deleted from innodb partitioned tables if --innodb_autoinc_lock_mode=0"

  Due to a previous bugfix which initializes a previously uninitialized
  variable, ha_partition::get_auto_increment() may fail to operate
  correctly when the storage engine reports that it is only reserving
  one value and one or more partitions have a different 'next-value'.
  Currently, only affects Innodb's new-style auto-increment code which
  reserves larger blocks of values and has less inter-thread contention.
2007-09-08 20:26:12 -07:00
kent/mysqldev@mysql.com/production.mysql.com
cf2b6a9747 ha_partition.cc, listener.h, listener.cc, ha_partition.h:
Initiate static const outside class definition
2007-09-07 13:30:42 +02:00
tomas@whalegate.ndb.mysql.com
35bddfecf7 Bug #11313 confusing/erroneous 4006 message 2007-09-07 11:15:07 +02:00
tomas@whalegate.ndb.mysql.com
b5e7c8dbd3 change printout to be a warning 2007-09-05 19:39:13 +02:00