Commit graph

235 commits

Author SHA1 Message Date
monty@mysql.com
7cf8285b3f After merge fixes
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results
2005-01-04 13:46:53 +02:00
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
mskold@mysql.com
8edd9baa2c Fixed failed merge 2005-01-03 11:56:51 +01:00
mskold@mysql.com
689748b548 Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 2005-01-03 09:46:59 +01:00
mskold@mysql.com
3d50cc0457 Fixed failed merge 2005-01-01 22:47:50 +01:00
mskold@mysql.com
94845764ca Fixed failed merge 2005-01-01 22:40:40 +01:00
monty@mysql.com
d71c030587 After merge fixes 2004-12-31 00:44:00 +02:00
mskold@mysql.com
76b2df6043 Merged bugfix 2004-12-30 21:36:16 +01:00
marty@linux.site
1ddb554b8b Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browser 2004-12-30 19:56:09 +01:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
tomas@poseidon.ndb.mysql.com
7b47be8990 added config parameter Group on connection
moved NdbWaiter, m_ndb_cluster_connection, to impl class
    moved node selection things to cluster connection
    moved all private things to impl class
    added opts for shared memory and node selection
    changed opts handling somewhat; introduced enum for options and common handling of option variables
    added checks for transporter support
    automatic addition of shared mem transporters
    moved wait_until_ready code to cluster connection
    added control of usage of new node selection method
2004-12-20 12:36:14 +01:00
joreland@mysql.com
cfa20fbaa6 merge 2004-12-17 10:36:14 +01:00
mskold@mysql.com
885a9d6ef5 Removed getTableForAlteration 2004-12-07 10:27:22 +01:00
monty@mysql.com
77207d19f2 Merge with new VARCHAR code 2004-12-06 19:18:35 +02:00
joreland@mysql.com
50e15affff Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl1744
2004-12-06 14:52:31 +01:00
mskold@mysql.com
3791170159 Fix for bug#6935 table rename does not work with ndb tables 2004-12-06 14:51:10 +01:00
monty@mysql.com
67ce247965 Add support for up to VARCHAR (size up to 65535)
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
brian@avenger.(none)
b85f4677d5 Merge for Matt for Innodb bug. 2004-11-30 10:10:40 -08:00
tomas@poseidon.ndb.mysql.com
aec0b4e4d7 fixed error in test result
added extra calls to retrieve connectstring used
    reengineered connect somewhat to make retries etc explicit
2004-11-30 17:47:47 +00:00
joreland@mysql.com
85f8ad7bd1 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-30 07:45:49 +01:00
joreland@mysql.com
e86ce67ea5 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-30 07:43:19 +01:00
joreland@mysql.com
474f23a402 ndb - fixed long overdue problems with unique indexes and null values 2004-11-30 07:41:26 +01:00
brian@avenger.(none)
2b0b6ec20c Merging 4.1 to 5.0 2004-11-24 12:34:44 -08:00
serg@serg.mylan
ee933cd198 merged 2004-11-22 21:33:15 +01:00
tomas@poseidon.ndb.mysql.com
2e63f22a71 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
2004-11-22 15:53:06 +00:00
tomas@poseidon.ndb.mysql.com
1d981111e0 added force send interface to scan
prepared for using query cache in ndb
2004-11-22 13:41:46 +00:00
mskold@mysql.com
f0e95c3704 Added checks for NOT NULL for all fields in UNIQUE INDEX (USING HASH) 2004-11-22 10:35:03 +01:00
serg@serg.mylan
2d3dd65cc1 merged 2004-11-20 18:36:41 +01:00
tomas@poseidon.ndb.mysql.com
fdfc731155 ha_ndbcluster.cc:
merge error
2004-11-19 09:27:16 +00:00
tomas@poseidon.ndb.mysql.com
2ec794a970 Merge 2004-11-18 21:54:53 +00:00
mskold@mysql.com
7bbee8c95d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-18 15:55:18 +01:00
mskold@mysql.com
a4d061a5d9 Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key .. 2004-11-18 12:11:56 +01:00
pekka@mysql.com
bc31325180 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-18 11:55:53 +01:00
serg@serg.mylan
e68bd85b77 merged 2004-11-17 18:04:36 +01:00
tomas@poseidon.ndb.mysql.com
1700bf3844 Enabled usage of new system variables for ndb
- ndb_use_exact_count
  - ndb_autoincrement_prefetch_sz
  - ndb_use_transactions
  - ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
enabled printout od ndb errors in warnings even if mapping existst to mysql error code
2004-11-17 08:15:53 +00:00
tomas@poseidon.ndb.mysql.com
a69ddb033d ha_ndbcluster.cc:
reverting previous patch
2004-11-16 13:56:25 +00:00
tomas@poseidon.ndb.mysql.com
8ee2a1836e Also print warning if there is an ndb->mysql errorcode mapping, this since the warning provides valuable info to the user 2004-11-16 12:10:44 +00:00
pekka@mysql.com
52e05dadac ndb: fix bug-4644 Err Out of fragment operations 2004-11-13 17:34:34 +01:00
brian@avenger.(none)
f05daf02ba Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
joreland@mysql.com
b2ff852c62 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
2004-11-10 21:53:21 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
dd1cd8aa46 Bug#6031 - To drop database you have to execute DROP DATABASE command twice.
DROP DATABASE failed because of file ext not in TYPELIB of known extensions.
  General solution - construct a TYPELIB at runtime instead of a static list.
2004-11-10 15:07:11 +00:00
Administrator@w2k.
414298f38b Merge joreland@bk-internal.mysql.com:wl1744 into w2k.:C:/mysql-4.1 2004-11-10 14:02:59 +01:00
joreland@mysql.com
aeafd88e19 bug#6538
ndb: Fix return value in index_last wo/ rows
2004-11-10 11:02:51 +01:00
joreland@mysql.com
31303bd0de wl1744 - win compile fixes 2004-11-10 00:39:12 +01:00
monty@mysql.com
1087186657 Merge with 4.1 to get new thd->mem_root handling 2004-11-08 17:53:32 +02:00
joreland@mysql.com
9d8dcdcf72 Merge mysql.com:/home/jonas/src/new-fix
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-08 11:26:34 +01:00
joreland@mysql.com
3821a8dfca ndb: bug#6435
fix null handling in ha_ndbcluster when using ordered index
2004-11-08 11:11:49 +01:00
joreland@mysql.com
8acbd6a2ba ndb: bug#6451
1) fix so that missing blob tables don't prevent table from being
    dropped
2) decrease size of blob part if record length exceeds max length
3) add test case for table wo/ corresponding blob table
4) init scan counters when sending scan_tabreq
2004-11-08 11:06:36 +01:00
monty@mysql.com
071001950e Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
mskold@mysql.com
0bd6fd7875 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-04 10:43:52 +01:00