mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34557 commits 2784 branches 343 tags 1.6 GiB
Commit graph

699 commits

Author SHA1 Message Date
mskold@mysql.com
8cd139c27a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-05-31 15:32:49 +02:00
mskold@mysql.com
f838e8a499 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-4.1
 2006-05-30 13:20:38 +02:00
pekka@mysql.com
00cbeb84ec ndb - minor fix to unhandled error, already in 5.1 [ auto-incr ] 2006-05-25 21:27:56 +02:00
pekka@mysql.com
6ff1648d99 ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ] 2006-05-25 18:00:55 +02:00
pekka@mysql.com
da807a85b9 Merge mysql.com:/space/pekka/ndb/version/my50 
into  mysql.com:/space/pekka/ndb/version/my50-bug14509
 2006-05-25 13:08:50 +02:00
mskold@mysql.com
cdccc77244 Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-05-22 15:16:37 +02:00
pekka@mysql.com
54963c2e52 ndb - bug#14509 [related] re-do auto-incr error handling 2006-05-17 12:40:10 +02:00
pekka@mysql.com
dd58dd51a1 ndb - bug#14509 [related] setAutoIncrement: add error handling 2006-05-16 12:58:41 +02:00
tomas@poseidon.ndb.mysql.com
ca4b18fb15 correction of merge 2006-05-15 20:29:50 +02:00
tomas@poseidon.ndb.mysql.com
747dc71f9f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-05-15 18:44:17 +02:00
tomas@poseidon.ndb.mysql.com
fe9934c9fe Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail 
- invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
- add check for correct frm on external lock when table cache is found invalid
 2006-05-15 16:23:59 +02:00
mskold@mysql.com
9f2ff929fe Bug#16997 Table rename that changes database does not rename indexes, recreate indexes in new database 2006-05-05 17:18:47 +02:00
tomas@poseidon.ndb.mysql.com
edba345e56 Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error 
- added retry handling of temporary transaction errors
 2006-04-26 16:57:44 +02:00
mskold@mysql.com
435c1028fc Fixed memleak detected by valgrind 2006-04-25 12:40:31 +02:00
msvensson@neptunus.(none)
abf41982f8 Add surrounding braces, move invalidate dictionary_cace to after declaration of variable "table_list" 2006-04-11 09:46:03 +02:00
msvensson@neptunus.(none)
875154606e Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-11 09:09:21 +02:00
jimw@mysql.com
a159a55c2c Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-10 14:30:00 -07:00
msvensson@neptunus.(none)
c2f1259834 Merge neptunus.(none):/home/msvensson/mysql/bug13228/my50-bug13228_minimal 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-07 11:46:22 +02:00
jimw@mysql.com
1a59580dcd Bug #13601: Wrong int type for bit 
The wrong value was being reported as the field_length for BIT
  fields, resulting in confusion for at least Connector/J. The
  field_length is now always the number of bits in the field, as
  it should be.
 2006-04-04 17:54:58 -07:00
jonas@perch.ndb.mysql.com
48fa5cb63c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-03-28 15:40:08 +02:00
jonas@perch.ndb.mysql.com
0a9db2a056 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-03-28 15:31:26 +02:00
jonas@perch.ndb.mysql.com
4e819b7377 ndb - bug#17729 bug#18406 
Ndbapi can reorder recattr when doing sorted scan (for faster comparision)
    make sure handler maps correct recattr to correct mysql column
 2006-03-28 14:38:16 +02:00
mskold@mysql.com
37a6167d6d Post review fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text) 2006-03-28 11:46:35 +02:00
mskold@mysql.com
c76ab0a4f6 Fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text) 2006-03-28 09:59:20 +02:00
mskold@mysql.com
1bb473c3ab If doing write, then peeking is not needed 2006-03-24 10:45:00 +01:00
mskold@mysql.com
a40d91284a Post review fix of Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted', shared locking is sufficient 2006-03-23 15:20:24 +01:00
mskold@mysql.com
25c149da04 Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted' 2006-03-23 09:48:46 +01:00
msvensson@neptunus.(none)
4bbf5eb01c Bug#16795 ndb_cache_multi2 
- Change && to ||
 - Check for return value != 0 in "ndb->init()"
 2006-02-27 10:29:55 +01:00
tomas@poseidon.ndb.mysql.com
4f449e4f22 ndb: 
add optional reporting of of a "name" tied to a nodeid in the cluster log
reporting added for mysql server and ndb_restore
 2006-02-13 12:58:12 +01:00
tomas@poseidon.ndb.mysql.com
5ba3f69f3e manual merge 2006-02-10 17:59:53 +01:00
tomas@poseidon.ndb.mysql.com
27a14f93eb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-10 17:50:17 +01:00
tomas@poseidon.ndb.mysql.com
7050a7586e Bug #17249 ndb, delete statement with join where clause fails when table do 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
 2006-02-10 17:40:22 +01:00
pekka@mysql.com
05353723f0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-07 20:04:54 +01:00
pekka@mysql.com
9aa06f3bc1 ndb - bug#15918 fix 2006-02-07 19:57:31 +01:00
tomas@poseidon.ndb.mysql.com
6fe11666fd Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-07 11:31:52 +01:00
tomas@poseidon.ndb.mysql.com
06a57659d8 Bug #17081 "LOAD DATA INFILE" may not load all the data 2006-02-07 11:30:42 +01:00
tomas@poseidon.ndb.mysql.com
c445b29d4d ndb, transaction should be refgistred even if m_transaction_on is not set 2006-02-07 00:26:47 +01:00
tomas@poseidon.ndb.mysql.com
3f6671d72a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-07 00:06:28 +01:00
tomas@poseidon.ndb.mysql.com
5bbb5c29b7 Bug #17154 load data infile of char values into a table of char(PK) hangs 
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
 2006-02-07 00:03:39 +01:00
msvensson@neptunus.(none)
679b293a47 Bug #13228 open table cache not flushed when table schema changed 
- Close open unused handlers when a schema error occurs.
 2006-01-10 11:35:21 +01:00
jimw@mysql.com
d8a4aafe33 Merge mysql.com:/home/jimw/my/mysql-5.0-14212 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-01-06 08:34:55 -08:00
monty@mysql.com
b0a5ea01ef Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-01-06 01:08:48 +02:00
monty@mysql.com
6e22e29de6 Review fixes of new pushed code 
- 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
 2006-01-06 00:47:49 +02:00
jonas@perch.ndb.mysql.com
6a02895276 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-12-14 11:34:08 +01:00
jonas@perch.ndb.mysql.com
1864165ff3 bug#15682 - ndb - invalid handling of varchar in position/rnd_pos 2005-12-14 10:57:09 +01:00
jimw@mysql.com
d07a57c03a Fix crash in BDB from improper cleanup of transactions, and avoid problem 
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.
 2005-12-09 15:00:33 -08:00
konstantin@mysql.com
9fd6204ad1 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-11-25 13:57:13 +03:00
mskold@mysql.com
f27dc1c232 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-24 16:21:49 +01:00
mskold@mysql.com
70d447c1f1 Moved check of wrong schema version earlier 2005-11-24 16:21:07 +01:00
msvensson@neptunus.(none)
e6331657a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-11-21 12:28:36 +01:00
msvensson@neptunus.(none)
9301123eb3 Bug #14514 Creating table with packed key fails silently 
- Backport from 5.0
 2005-11-21 12:27:58 +01:00
mskold@mysql.com
96413a44d1 Using new error code HA_ERR_TABLE_DEF_CHANGED to signal wrong schema version of table 2005-11-18 09:54:49 +01:00
mskold@mysql.com
8ca38a90ad Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-17 15:38:15 +01:00
mskold@mysql.com
77cbf5d3ff Fixed incorrectly use if table with wrong schema version 2005-11-17 12:45:23 +01:00
monty@mysql.com
90ca9150a4 Fixes during review of new code 
Destroy LOCK_uuid_generator
 2005-11-03 22:42:25 +02:00
msvensson@neptunus.(none)
8e7dfad543 BUG#14514 Creating table with packed key fails silently 2005-11-02 15:53:04 +01:00
brian@zim.(none)
82bcb8b369 This patch add support for storing Geometry types to Archive, Innodb, NDB, and BDB. 2005-10-24 23:20:39 -07:00
mskold@mysql.com
4ddfe56f9a Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-10-14 11:28:01 +02:00
mskold@mysql.com
f9b58b0805 Fix for Bug #13961 Triggers on tables with auto_increment insert bogus values into table (clean version) 2005-10-14 11:23:02 +02:00
monty@mysql.com
5513ab69b7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-12 00:59:52 +03:00
monty@mysql.com
f5fdf3e87a Reviewing new pushed code 
- 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
 2005-10-12 00:58:22 +03:00
serg@serg.mylan
e91712d9bb pthread_handler_decl() changed to be ctags-friendly 
(and contain extern "C" when necessary)
 2005-10-08 16:39:55 +02:00
brian@zim.(none)
11be8401a7 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/fix-5.0
 2005-10-03 21:09:01 -07:00
brian@zim.(none)
2a42afd132 Final patch for 5.0 for simplifying storage engine code. We now have just 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.
 2005-10-03 18:42:30 -07:00
brian@zim.(none)
0ba8ca2a17 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/fix-5.0
 2005-10-02 20:13:18 -07:00
brian@zim.(none)
54a958993c Next big patch for loadable storage engines! 
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.
 2005-10-02 19:44:28 -07:00
serg@mysql.com
78001860a6 Merge 2005-09-30 20:30:09 +02:00
serg@serg.mylan
bef3c587c6 Bug#11238 
"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)
 2005-09-30 20:20:10 +02:00
sergefp@mysql.com
3625ec5127 BUG#13081: Disable ROR-index_merge for NDB tables (by adding a 
HA_KEY_SCAN_NOT_ROR index flag) as NDB index scans are not guaranteed to be ROR 
scans.
 2005-09-30 14:20:15 +04:00
lars@mysql.com
9528d0aefd Fixed gcc error on AMD64: cast from 'char*' to 'unsigned int' loses precision 2005-09-26 16:49:18 +02:00
jonas@perch.ndb.mysql.com
6ed4539561 ndb post merge fixes (show engine ndb status) 2005-09-21 13:22:27 +02:00
jonas@perch.ndb.mysql.com
09c88914e2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-20 12:22:31 +02:00
jonas@perch.ndb.mysql.com
75cc4ef28a ndb - post merge fixes 2005-09-20 12:07:18 +02:00
jonas@perch.ndb.mysql.com
2119a88abe Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2005-09-20 10:46:33 +02:00
brian@zim.(none)
616c324436 Cleanup for handlerton structure to allow for loadable engine work. This is the first in a series of patches. 2005-09-19 12:06:23 -07:00
jonas@perch.ndb.mysql.com
668a192ce5 ndb - imlp. show engine ndb status; 
that dump free list allocation per connection
 2005-09-19 15:35:07 +02:00
monty@mishka.mysql.fi
f348f62cc3 Added option --valgrind-mysqltest to mysql-test-run 
Added flag to Field::store(longlong) to specify if value is unsigned.
This fixes bug #12750: Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)
Fixed warning from valgrind in CREATE ... SELECT
Fixed double free of mysql.options if reconnect failed
 2005-09-14 01:41:44 +03:00
mskold@mysql.com
a934f75e81 Repair of condition pushdown after Item_func_between/in objects now directly represent NOT BETWEEN/IN expressions (ChangeSet@1.2402.1.1) 2005-09-12 09:36:07 +02:00
pekka@mysql.com
cf626c2000 ndb - fix ha_ndb crash on ordered index on nullable varchar 2005-09-01 14:12:48 +02:00
jonas@eel.(none)
7c70be87b7 Merge eel.(none):/home/jonas/src/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-18 14:28:13 +02:00
jonas@eel.(none)
6399a93ac2 Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-5.0
 2005-08-18 14:25:00 +02:00
jonas@eel.(none)
96f719818c Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-18 14:07:31 +02:00
jonas@eel.(none)
3b68047235 bug#12118 - ndb alter table data loss 
Split table version into 2 (major, minor)
  Impl. signaling to API when table has been altered
  Allow running transactions to use any minor number for transactions
 2005-08-18 14:02:25 +02:00
monty@mysql.com
4c0d23e156 Fixes during review of new pushed code 
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
 2005-08-12 13:54:42 +03:00
mskold@mysql.com
978d67a9ea Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-08-10 09:52:58 +02:00
mskold@mysql.com
eeecb84050 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-08-10 09:45:05 +02:00
mskold@mysql.com
7ccf9b9708 Added support for ha_ndbcluster::info(HA_STATUS_AUTO) 2005-08-10 09:38:36 +02:00
mskold@mysql.com
cc62018ff6 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-release 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-08-01 11:52:07 +02:00
mskold@mysql.com
0f0fb8a05a Fixed handling of NOT LIKE after Item_func::NOTLIKE_FUNC has been removed 2005-08-01 11:50:43 +02:00
mskold@mysql.com
d969a9ab68 Fix for bug#12021 2005-07-31 21:33:46 +02:00
sergefp@mysql.com
e5ba8ba521 Remove Item_func::NOTLIKE_FUNC and all [dead] code that uses it 2005-07-29 03:37:06 +02:00
monty@mysql.com
987edeaa9b Fixed compiler warnings 2005-07-28 21:25:05 +03:00
konstantin@mysql.com
21957c423e Implement MySQL framework to support consistent read views in 
cursors. This should fix Bug#11813 when InnoDB part is in 
(tested with a draft patch).
The idea of the patch is that if a storage engine supports
consistent read views, we open one when open a cursor,
set is as the active view when fetch from the cursor, and close
together with cursor close.
 2005-07-20 20:02:36 +04:00
elliot@mysql.com
7e4179ea02 ha_ndbcluster.cc: 
BUG#12040 Fixed compile failure by using %p instead of %x to print a pointer in DBUG_PRINT
 2005-07-19 22:04:43 +02:00
konstantin@mysql.com
14344b658a A fix and a test case for Bug#10760 and complementary cleanups. 
The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same 
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes.
 2005-07-19 22:21:12 +04:00
monty@mishka.local
2278e0319c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc Cleanups during review 
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
 2005-07-18 15:33:18 +03:00
mskold@mysql.com
fe73e69b4e Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-06 11:39:48 +02:00
mskold@mysql.com
7063d85bf9 Fixed handling of failed primary key update in INSERT .. ON DUPLICATE KEY UPDATE .. 2005-07-06 11:23:36 +02:00
mskold@mysql.com
bfa7f55d3c Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-05 10:01:27 +02:00
mskold@mysql.com
77c481329c Fixed indentation 2005-07-04 20:36:38 +02:00
monty@mysql.com
fe30ec9032 manual merge 2005-07-04 03:50:04 +03:00
monty@mysql.com
ec420bfb43 Fixes during review of new code 
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
 2005-07-04 03:42:33 +03:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
marty@linux.site
e4aedcc2c1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  linux.site:/home/marty/MySQL/mysql-5.0
 2005-06-30 12:20:52 +02:00
mskold@mysql.com
569a846120 Changed delete_row to always get key from record argument, removed unused function 2005-06-29 16:17:47 +02:00
mskold@mysql.com
ec4bb86379 Changed delete_row to always get key from record argument 2005-06-29 16:13:50 +02:00
monty@mishka.local
6db013ef86 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-06-27 16:47:44 +03:00
monty@mishka.local
83f90e060e Better bug fix for: 
#9728  'Decreased functionality in "on duplicate key update
#8147  'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE'

This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part
 2005-06-27 16:46:41 +03:00
msvensson@neptunus.(none)
85b9ffc4ca Merged from mysql-4.1 to mysql-5.0 2005-06-22 14:10:02 +02:00
msvensson@neptunus.(none)
ddeaf342a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-06-21 14:24:13 +02:00
mskold@mysql.com
91c422e029 Merge 2005-06-20 18:02:47 +02:00
mskold@mysql.com
d34fce5bf6 ha_ndbcluster.cc: 
Added CR for readability
 2005-06-20 17:17:44 +02:00
mskold@mysql.com
e8e6554a22 Added comment to store_lock 2005-06-20 17:16:22 +02:00
msvensson@neptunus.(none)
73c1578f15 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug10365
 2005-06-20 13:08:45 +02:00
mskold@mysql.com
6fa3cdad5f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-20 09:37:31 +02:00
tulin@dl145c.mysql.com
2d654a5551 Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-06-20 07:57:09 +02:00
tulin@dl145c.mysql.com
61c36b1c12 ha_ndbcluster.cc: 
remove typecheck in ndb handler not needed
 2005-06-20 07:53:53 +02:00
mskold@mysql.com
dc5e1444a0 Fix for bug#10936: Cluster engine shows wrong key value for duplicate key error 2005-06-17 14:45:54 +02:00
msvensson@neptunus.(none)
4602b1809f BUG10365 Cluster handler uses non-standard error code 
- Updated after review
 2005-06-16 15:17:47 +02:00
mskold@mysql.com
e6e4087f8b Relaxed type checking to allow int to real coercion 2005-06-10 10:34:05 +02:00
joreland@mysql.com
65e5d9e982 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-09 16:13:23 +02:00
joreland@mysql.com
f6bb7cabbe merge 2005-06-09 15:44:57 +02:00
joreland@mysql.com
14d74e75db bug#11205 - ndb - 4006 when starting scan 2005-06-09 15:39:14 +02:00
mskold@mysql.com
39fba6c556 Disallow TL_WRITE_ALLOW_READ being transformed into TL_WRITE_ALLOW_WRITE 2005-06-09 13:28:29 +02:00
msvensson@neptunus.(none)
8771c73258 BUG#10365 Cluster handler uses non-standard error codes 
- Added better error messages when trying to open a table that can't be discovered or unpacked. The most likely cause of this is that it does not have any frm data, probably since it has been created from NdbApi or is a NDB system table.
 - Separated functionality that was in ha_create_table_from_engine into two functions. One that checks if the table exists and another one that tries to create the table from the engine.
 2005-06-08 13:31:59 +02:00
joreland@mysql.com
ebc9d76ddc Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-07 17:09:47 +02:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
serg@serg.mylan
6a5349028c a compiler must see '#pragma implementation' *before* 
'#pragma interface' (that comes with the #include'd header file)
 2005-06-05 19:38:52 +02:00
monty@mysql.com
4b7882dc73 merge 2005-06-05 17:19:50 +03:00
monty@mysql.com
29fd1f2fd9 Move USE_PRAGMA_IMPLEMENTATION to proper place 
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
 2005-06-03 23:46:03 +03:00
mskold@mysql.com
9cebe281bb Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-06-02 17:06:51 +02:00
mskold@mysql.com
cc524b4fda Removed bug introduced when implementing support for IN and BETWEEN 2005-06-02 14:46:58 +02:00
msvensson@neptunus.(none)
abd3a84f7a BUG#9626 Several serious errors reported by Valgrind in latest 5.0 bk tree 
- Fix several valgrind warnings.
 2005-06-02 14:32:06 +02:00
kent@mysql.com
f0fcc54b0c Merge 2005-06-02 04:45:09 +02:00
kent@mysql.com
bd48eed988 tztime.cc: 
Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
 2005-06-02 02:43:32 +02:00
monty@mysql.com
a69f432115 Code cleanups during code reviews 
Ensure we get error if INSERT IGNORE ... SELECT fails
Fixed wrong key_part->key_length usage in index_merge
 2005-06-01 16:35:09 +03:00
mskold@mysql.com
e8613e53b9 Fixed handling of condition pushdown to storage engine of NO BETWEEN and NOT IN 2005-06-01 11:56:47 +02:00
msvensson@neptunus.(none)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +02:00
msvensson@neptunus.(none)
83d430353e Add ifdefs to control when "#pragma implementation" should be used 
Added some more ifdefs for "#pragma interface"
 2005-05-26 12:09:14 +02:00
mskold@mysql.com
82490f1492 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-05-23 07:26:55 +02:00
msvensson@neptunus.(none)
2d515425a3 BUG#9626 
- Fix valgrind warnings
 - Remove static db, schema and table name buffers from Ndb.cpp
 2005-05-18 20:50:29 +02:00
mskold@mysql.com
0b8de7cfce Added support for BETWEEN and IN in condition pushdown to ndbcluster by rewriting them as AND and OR expressions 2005-05-18 14:32:05 +02:00
mskold@mysql.com
66f881a8f6 Removed call to cond_push for empty cond 2005-05-08 22:42:40 +02:00
mskold@mysql.com
bea71274f7 Merge 2005-05-07 22:49:04 +02:00
mskold@mysql.com
a785052d7d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-05-07 22:44:49 +02:00
mskold@mysql.com
1eaa54a4d8 Removed double cond_push 2005-05-07 22:41:30 +02:00
mskold@mysql.com
cb8d2905aa bug#9813: Post review fixes 2005-05-07 22:04:52 +02:00
monty@mishka.local
015cd1cd21 merge 2005-05-06 13:51:58 +03:00
monty@mishka.local
a9f6aab4c9 Fixes while reviewing new code 
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
 2005-05-06 11:39:30 +03:00