jani@ua141d10.elisa.omakaista.fi
bcbc0031eb
Fixed compiler warnings.
2007-02-28 22:23:35 +02:00
monty@mysql.com/narttu.mysql.fi
8f4fef291d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-02-22 20:32:19 +02:00
monty@mysql.com/narttu.mysql.fi
6946fa682f
After merge fixes
...
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
2007-02-21 19:38:40 +02:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-02-21 14:07:08 +02:00
tomas@poseidon.mysql.com
b7c3aeae2c
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-02-14 15:18:15 +07:00
tomas@poseidon.mysql.com
120eaec17c
Bug #21033 Error 0 in readAutoIncrementValue()
...
- do not call function if table has no autoincrement
2007-02-14 15:16:26 +07:00
tomas@poseidon.mysql.com
d56756de0a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-02-08 00:00:14 +07:00
mskold/marty@mysql.com/linux.site
5df38bfc3e
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-02-07 12:29:34 +01:00
mskold/marty@mysql.com/linux.site
2d0bd82a06
NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc:
...
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
Removed stray mthod declaration
2007-02-07 11:36:34 +01:00
mskold/marty@mysql.com/linux.site
0446aa9cbd
Fix for bug#25821 Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range
2007-02-06 23:06:58 +01:00
mskold/marty@mysql.com/linux.site
0e20ef0ae4
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-02-01 13:59:34 +01:00
mskold/marty@mysql.com/linux.site
c16251ad7c
Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment
2007-02-01 09:48:45 +01:00
mskold/marty@mysql.com/linux.site
5cd40ad30b
Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached
2007-01-31 22:38:06 +01:00
df@kahlann.erinye.com
cb6c5f7ee7
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-24 09:24:52 +01:00
pekka@clam.ndb.mysql.com/clam.(none)
56e2d4ffcb
ndb - bug#25562 use byte-size max_data_length() when setting blob part size
2007-01-23 12:58:10 +01:00
tomas@poseidon.mysql.com
12911bb5c0
bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
...
- post review changes
2007-01-23 07:12:03 +07:00
tomas@poseidon.mysql.com
9605aee4fe
bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
...
- make sure keys are copied correctly when varchar has 2 length bytes
- test case
2007-01-23 00:34:00 +07:00
monty@mysql.com/narttu.mysql.fi
a04157fbb3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-01-22 14:04:40 +02:00
tulin/mysqldev@mysql.com/production.mysql.com
2fed34d7ea
ha_ndbcluster.cc:
...
Bug #25668 - corrected patch after test failures
2007-01-17 10:41:52 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
1d6fe0ffaa
ha_ndbcluster.cc:
...
Bug #25668 ndb: mysqld may core if cluster disconnected
-- pTrans may be NULL, remove not needed usage of handler::ndb_err
2007-01-17 10:06:50 +01:00
mskold/marty@mysql.com/linux.site
0627ce96c8
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-01-08 11:18:24 +01:00
mskold/marty@mysql.com/linux.site
db0107b801
bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking
2007-01-08 10:38:53 +01:00
mskold/marty@mysql.com/linux.site
a4e84daa7f
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-01-03 10:04:47 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
monty@mysql.com/narttu.mysql.fi
9d3fda77c8
After merge fixes:
...
- Remove compiler warnings
- Fix merge errors
- Indentation fixes
2006-12-15 06:21:15 +02:00
monty@mysql.com/narttu.mysql.fi
a6481aa4c7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-12-15 01:01:52 +02:00
monty@mysql.com/narttu.mysql.fi
88dd873de0
Fixed compiler warnings detected by option -Wshadow and -Wunused:
...
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments
Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c
I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
2006-12-15 00:51:37 +02:00
mskold/marty@mysql.com/linux.site
8d8d063f91
Removed check for impossible error return
2006-12-14 16:27:14 +01:00
mskold/marty@mysql.com/linux.site
6e8f99d29b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-04 15:09:47 +01:00
mskold/marty@mysql.com/linux.site
2311316962
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-11-30 23:12:33 +01:00
mskold/marty@mysql.com/linux.site
aa03fbcac9
bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated
2006-11-30 22:52:23 +01:00
monty@mysql.com/narttu.mysql.fi
601e6f4b2a
Fixed compiler warnings
...
Don't assert if my_thread_end() is called twice (common case)
2006-11-30 21:56:03 +02:00
mskold/marty@mysql.com/linux.site
e71c09b482
bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: handle INSERT ... ON DUPLICATE KEY UPDATE
2006-11-30 17:22:04 +01:00
mskold/marty@mysql.com/linux.site
a172df24a9
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-11-30 16:04:12 +01:00
mskold/marty@mysql.com/linux.site
af324d9cf0
#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: call peek_index_rows
2006-11-30 15:02:33 +01:00
monty@mysql.com/nosik.monty.fi
e825879800
Remove compiler warnings
...
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
mskold/marty@mysql.com/linux.site
f293350725
bug#21507 I can't create a unique hash index in NDB: Added possibillity to create hash only indexes with NULL valued attributes, but any NULL valued access will become full table scan with pushed condition on index attribute values
2006-11-07 16:38:37 +01:00
jonas@perch.ndb.mysql.com
6e4a0ec042
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-25 08:28:30 +02:00
stewart@willster.(none)
dc38d0249a
fix ndb_cache_multi2
...
util thread wasn't behaving correctly after 241 error due to get_table_statistics
not properly returning an error code
2006-10-24 23:26:58 +10:00
mskold/marty@mysql.com/linux.site
8da80dd39d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-10-24 08:29:37 +02:00
stewart@willster.(none)
826628c99b
post merge fix
2006-10-24 00:18:57 +10:00
stewart@willster.(none)
3c2eeb2c15
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
2006-10-23 23:57:28 +10:00
stewart@willster.(none)
5926602aa7
Bug #19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
...
fixes for ndb_* tests broken by previous fix
be more careful in ndb about setting errors on failure of info call (especially
in open)
2006-10-23 23:46:35 +10:00
jonas@perch.ndb.mysql.com
470e4daa14
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-19 09:38:37 +02:00
jonas@perch.ndb.mysql.com
2b04fb22be
ndb - bug#23200
...
this changes lock taken during peek, to decrease likelyhood of transaction abort
2006-10-19 09:27:58 +02:00
mskold/marty@mysql.com/linux.site
0522b11066
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-10-18 16:41:17 +02:00
mskold/marty@mysql.com/linux.site
b381ed95d9
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-10-18 14:28:18 +02:00
mskold/marty@mysql.com/linux.site
e7f69b424a
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-10-16 10:07:19 +02:00
stewart@willster.(none)
c1903d967a
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
2006-10-16 17:39:38 +10:00
mskold/marty@mysql.com/linux.site
aafe6e4663
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-10-16 08:33:22 +02:00