Commit graph

514 commits

Author SHA1 Message Date
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
holyfoot@hf-ibm.(none)
2c8e9df232 A lot of fixes to Precision math
Mostly about precision/decimals of the results of the operations
2005-05-05 20:06:49 +05:00
mskold@mysql.com
607b1a9987 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-29 11:53:35 +02:00
mskold@mysql.com
2428e7b1cc Fix for avoiding gettin Invalid schema object version when doing local changes, fixed found bug 2005-04-29 11:37:47 +02:00
mskold@mysql.com
69c17fe46c Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-28 10:48:08 +02:00
mskold@mysql.com
92dc45c86f Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes 2005-04-28 10:46:39 +02:00
mskold@mysql.com
47c2c96379 Merge 2005-04-28 10:28:56 +02:00
mskold@mysql.com
bbee23435d Fix for avoiding gettin Invalid schema object version when doing local changes, post review fixes 2005-04-28 09:39:29 +02:00
mskold@mysql.com
5f9843aeee Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
msvensson@neptunus.(none)
2627475a86 Merge neptunus.(none):/home/msvensson/mysql/bug9714
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 12:30:11 +02:00
msvensson@neptunus.(none)
c12ee8dc16 BUG#9714 libsupc++ problem
- Remove linking of libsupc++
 - Move all local static variables to filescope
2005-04-27 11:25:08 +02:00
mskold@mysql.com
1589bdf3dc Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-25 11:55:27 +02:00
mskold@mysql.com
93498bdf5a Post review fix of ndbcluster_drop_database, typo 2005-04-25 11:54:00 +02:00
mskold@mysql.com
2fd313de2f Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-25 11:47:39 +02:00
mskold@mysql.com
4649d5c30f Post review fix of ndbcluster_drop_database, print error 2005-04-25 11:34:47 +02:00
mskold@mysql.com
3a9af0553b Post review fix of ndbcluster_drop_database 2005-04-25 11:31:16 +02:00
mskold@mysql.com
5411f8a6e4 Merge 2005-04-22 17:38:28 +02:00
mskold@mysql.com
9457551616 Fix for Bug #9318 drop database does not drop ndb tables 2005-04-22 15:28:23 +02:00
mskold@mysql.com
564eb3dc98 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-21 13:12:59 +02:00
mskold@mysql.com
ad9fba9f38 Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert 2005-04-21 13:09:19 +02:00
pekka@mysql.com
ae2346dd94 ndb - fix typo 2005-04-21 12:53:40 +02:00
mskold@mysql.com
b1c8e44ead Merge 2005-04-21 10:26:14 +02:00
mskold@mysql.com
4193a314fb Fix for Bug #9691 UPDATE fails on attempt to update primary key 2005-04-19 11:21:26 +02:00
monty@mishka.local
c8170b349f Merge with 4.1 2005-04-16 04:35:54 +03:00
mskold@mysql.com
40a0548a1b Bug #9839 Column with AUTOINC contains -1 Value on node stop, post review fix 2005-04-15 16:14:08 +02:00
mskold@mysql.com
e889d234cb Bug #9839 Column with AUTOINC contains -1 Value on node stop 2005-04-15 15:52:07 +02:00
mskold@mysql.com
add3fd3cca Merge 2005-04-13 16:24:17 +02:00
mskold@mysql.com
e39ba63934 Merge 2005-04-13 14:08:54 +02:00
mskold@mysql.com
f5855f2d57 Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit 2005-04-13 12:42:23 +02:00
pekka@mysql.com
fd5b9f7ed7 ndb - csc#4847 - manual merge 4.1->5.0 2005-04-11 12:43:58 +02:00
mskold@mysql.com
e8f45332bd Merge 2005-04-08 19:42:57 +02:00
mskold@mysql.com
497f2684d8 Merge from fix of Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-08 16:49:14 +02:00
mskold@mysql.com
20a82a1a6a Fixed broken auto_increment 2005-04-08 12:34:52 +02:00
msvensson@neptunus.(none)
f9dd856d9e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-07 21:29:33 +02:00
msvensson@neptunus.(none)
960410274c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-07 20:21:17 +02:00
msvensson@neptunus.(none)
7a0e28feb5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-07 20:19:25 +02:00
msvensson@neptunus.(none)
12b6252145 BUG#6762 ALTER TABLE gives weird results and error message
- Removed hardcoded error message from 4.1
2005-04-07 20:17:37 +02:00
mskold@mysql.com
600154704f Merge 2005-04-07 20:10:50 +02:00
mskold@mysql.com
b716302860 Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage, post review fix 2005-04-07 20:08:01 +02:00
mskold@mysql.com
e66eaaa2a0 Merge 2005-04-07 18:37:04 +02:00
mskold@mysql.com
89b140340c Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-07 17:44:09 +02:00
msvensson@neptunus.(none)
1e030d5d93 BUG#9626 Several serious errors reported by Valgrind in latest 5.0 bk tree
- Fixing obvious ones
2005-04-06 12:27:43 +02:00
msvensson@neptunus.(none)
771133bc6c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2156.1.5
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-05 21:31:54 +02:00
msvensson@neptunus.(none)
9a3a9d037f Merge neptunus.(none):/home/msvensson/mysql/bug6762-1.2152.20.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2156.1.5
2005-04-05 21:30:24 +02:00
msvensson@neptunus.(none)
71ccc569ae Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug6762
2005-04-04 17:09:53 +02:00
msvensson@neptunus.(none)
41c036a60b BUG#6762 ALTER TABLE gives weird results and error message
- Better error message when table definition has changed
2005-04-04 12:26:05 +02:00
mskold@mysql.com
e95f19afca Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-01 20:58:25 +02:00
mskold@mysql.com
cf7c0e43cb Fix for bug#9435: TIMESTAMP columns don't update 2005-04-01 17:59:46 +02:00
msvensson@neptunus.(none)
6f9b118626 Merge 2005-04-01 11:15:11 +02:00
magnus@msdesk.mysql.com
e8434aadca BUG#8585 ndb_cache2
- When deleting from a cursor the m_rows_changed variable was not properly incremented to indicate that m_share->commit_count should be cleared at end of trans.
2005-03-31 14:33:50 +02:00
mskold@mysql.com
68e5cf494e Merged 2005-03-22 22:31:51 +01:00
mskold@mysql.com
2adabcb328 Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:48:28 +01:00
mskold@mysql.com
27dbed4384 Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:42:08 +01:00
msvensson@neptunus.(none)
3a3a91cd5b BUG#6554: Problem Building MySql on Fedora Core 3
- Link with libsupc++.a which contains language support functions.
    see http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#2_5
2005-03-21 12:29:08 +01:00
msvensson@neptunus.(none)
3f8a66cbea Merged WL#2269 to mysql-5.0 2005-03-15 15:22:40 +01:00
msvensson@neptunus.(none)
2bdd710d3c WL#2269 Enable query cache for NDB part 2
-This is mostly fixes for correct behaviour when using query cache + transactions + the thread that
fetches commit count from NDB at regular intervals. The major fix is to add a
list in thd_ndb, that keeps a list of NDB_SHARE's that were modified by
transaction and then "clearing" them in ndbcluster_commit.
2005-03-15 15:03:25 +01:00
msvensson@neptunus.(none)
a7ad7784c3 Manual merge 2005-03-14 12:25:26 +01:00
msvensson@neptunus.(none)
13ec961c3a BUG#6554 Problem Building MySql on Fedora Core 3
- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3
2005-03-14 12:07:49 +01:00
serg@serg.mylan
8986ffebde print xa recovery progress
add names to handlertons
trans_need_2pc() macro
2005-03-13 21:58:09 +01:00
serg@serg.mylan
a85613f62c Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-11 21:37:52 +01:00
tomas@poseidon.ndb.mysql.com
c7925bd3be Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-03-10 09:20:44 +01:00
serg@serg.mylan
e40bf3c40b sql/ha_ndbcluster.cc
after merge fix
sql/sql_parse.cc
    correct max_connections condition
2005-03-10 00:10:10 +01:00
marty@linux.site
d88b75874b Fixed broken 4.1->5.0 merge 2005-03-09 23:38:11 +01:00
tomas@poseidon.ndb.mysql.com
3e95113461 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-03-09 21:19:57 +01:00
tomas@poseidon.ndb.mysql.com
a032510e19 corrected typo: deafault -> default 2005-03-09 16:39:23 +01:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
mskold@mysql.com
ce87085294 Review fixes for Bug #8753 Invalid schema
object version after dropping index
2005-03-07 10:53:16 +01:00
mskold@mysql.com
6fc6a7521a Fix for Bug #8753 Invalid schema object version after dropping index 2005-03-07 10:21:38 +01:00
joreland@mysql.com
1029db2b6d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-24 20:57:32 +01:00
joreland@mysql.com
0a265b6d84 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-24 20:48:33 +01:00
joreland@mysql.com
168847b8e1 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-24 19:01:36 +01:00
joreland@mysql.com
c25ce0e362 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-24 18:59:56 +01:00
joreland@mysql.com
15de06f290 bug#8786 - ndb autodiscover, sometimes fails
remove dict forwarding
  add api retries on NotMaster
2005-02-24 18:58:56 +01:00
mskold@mysql.com
4e6a4dfa13 Merge 2005-02-24 14:48:12 +01:00
mskold@mysql.com
00d5e43c75 Added support for condition pushdown to storage engine for LIKE of varbin 2005-02-24 11:09:14 +01:00
msvensson@neptunus.(none)
2570dc8883 Convert ndb-cache-check-time fomr milliseconds to seconds 2005-02-24 09:42:11 +01:00
mskold@mysql.com
e0dbdca79e ha_ndbcluster.cc:
Fixed faulty debug printout
ndb_condition_pushdown.test, ndb_condition_pushdown.result:
  Added BINARY and VARBINARY tests
2005-02-23 17:18:06 +01:00
mskold@mysql.com
364492239b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-23 15:54:22 +01:00
mskold@mysql.com
fcc37a0787 Fixes for condition pushdown to storage engine based on comments from code review 2005-02-23 15:51:26 +01:00
msvensson@neptunus.(none)
c4f1804d9c Manual merge 2005-02-22 11:19:41 +01:00
tulin@mysql.com
d863b8951d corrected errors in how ndbcluster handler closes down in case of error 2005-02-21 23:29:07 +01:00
mskold@mysql.com
b3d3f73753 Merge 2005-02-21 16:13:29 +01:00
msvensson@neptunus.(none)
b4417c7572 Fix so that ndb-cache-check-time is measured in milliseconds 2005-02-21 14:04:54 +01:00
joreland@mysql.com
b6e20e350f ndb - fix problems introduced/discovered by XA 2005-02-21 10:53:19 +01:00
mskold@mysql.com
bf2e97ca25 Added missing NOR 2005-02-19 14:18:57 +01:00
mskold@mysql.com
067543c4e8 Added support for LIKE and NOT LIKE in condition pushdown 2005-02-18 21:43:51 +01:00