Commit graph

1173 commits

Author SHA1 Message Date
mskold/marty@linux.site
b767f1a02c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-12 16:35:41 +02:00
mskold/marty@mysql.com/linux.site
bf52d20b4b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-09-12 16:24:39 +02:00
mskold/marty@mysql.com/linux.site
125df80e9b Bug #21378 Alter table from X storage engine to NDB could cause data loss: Added warning if local table shadows ndb table 2006-09-12 16:04:52 +02:00
brian@zim.(none)
1ac47c9513 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into  zim.(none):/tmp/merge-5.1
2006-09-06 09:23:47 -07:00
mskold/marty@linux.site
d33411e558 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-06 11:21:49 +02:00
mskold/marty@mysql.com/linux.site
6752861d1b Bug #21056 ndb pushdown equal/setValue error on datetime: only pushdown like of string type fields 2006-09-05 17:07:00 +02:00
guilhem@gbichot3.local
e4d3595b18 Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0".
In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
only NDB wanted that. Users and trainers complained that it affected
InnoDB and was a change compared to 4.1 where only NDB autocommitted.
To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
ha_ndbcluster::external_lock().
The result is that LOAD DATA INFILE commits all uncommitted changes
of NDB if this is an NDB table, its own changes if this is an NDB
table, but does not affect other engines.
Note: even though there is no "commit the full transaction at end"
anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
problems per a comment of Pem).
Note: ha_ndbcluster::has_transactions() does not give reliable results
because it says "yes" even if transactions are disabled in this engine...
2006-09-05 16:52:05 +02:00
mskold/marty@linux.site
04a62eb684 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-01 15:26:03 +02:00
brian@zim.(none)
b5fdcc2962 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into  zim.(none):/tmp/mysql-5.1-arch
2006-08-31 16:11:57 -07:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
38a59efbc9 add 2 placeholder values for config and system variables. 2006-08-30 14:27:29 -07:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
678e15174e Bug#20573
"strict mode: inserts autogenerated auto_increment value bigger than max"
  Strict mode should fail if autoincrement value is out of range
2006-08-30 13:20:39 -07:00
brian@zim.(none)
7ae3682dc8 This pulls two function calls which should have been handlerton calls out of handler.cc. 2006-08-30 12:28:25 -07:00
mskold/marty@mysql.com/linux.site
6bac3b8f40 NDBAPI cleanup 2006-08-30 11:41:21 +02:00
jonas@perch.ndb.mysql.com
365b69dc7f Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 22:56:23 +02:00
gni/root@dev3-127.(none)
dd82086f67 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
2006-08-29 11:04:51 +08:00
lzhou/root@dev3-138.dev.cn.tlan
3140881459 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/mysql-5.0-ndb-bj
2006-08-28 16:18:48 +00:00
brian@zim.(none)
baa914e66d Cleanup of unused variables.
Fixed "discover" in the handler API.

Fixed problem where handlerton was not zero'ed. I need to look around, I suspect this problem is more widespread.
2006-08-25 13:31:15 -07:00
jonas@perch.ndb.mysql.com
b1d5f861dd Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-23 11:02:27 +02:00
jonas@perch.ndb.mysql.com
4cab70171e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-08-23 11:00:29 +02:00
brian@zim.(none)
b518763728 This changest:
Plugins now when compiled or not compiled work correctly with status variables. 
Status variables from plugins now set their own names (removed bit where plugin name was pre-appended this broke Innodb and Cluster)
A few Makefile cleanups.
2006-08-22 16:24:12 -07:00
jonas@perch.ndb.mysql.com
a0bba5faef correct merge 2006-08-22 22:52:03 +02:00
jonas@perch.ndb.mysql.com
0edae8e98f Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-22 20:59:20 +02:00
jonas@perch.ndb.mysql.com
93a83f3884 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-08-22 20:55:28 +02:00
pekka@orca.ndb.mysql.com
9dc6087d4d ndb - post-merge fix 5.0 to 5.0-ndb: number of frags if --without-big-tables 2006-08-22 14:26:56 +02:00
jonas@perch.ndb.mysql.com
a1420b1df8 merge 2006-08-17 20:51:44 +02:00
jonas@perch.ndb.mysql.com
560fc3e3b3 Merge perch.ndb.mysql.com:/home/jonas/src/51-clean
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-17 19:49:00 +02:00
mskold/marty@linux.site
604f3f8a69 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-08-15 14:39:48 +02:00
mskold/marty@mysql.com/linux.site
c8b93da355 Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range 2006-08-15 14:31:21 +02:00
jonas@perch.ndb.mysql.com
3cd1826ef0 ndb - bug#20708
init ndb_cache_check_time and honor value in my.cnf
2006-08-15 14:22:47 +02:00
mskold/marty@mysql.com/linux.site
66e8255491 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-08-15 13:37:39 +02:00
mskold/marty@mysql.com/linux.site
6a3143e2a0 ndb_lock.test, ndb_lock.result:
bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
2006-08-15 13:12:27 +02:00
gni/root@dev3-127.(none)
3b413775c5 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
2006-08-15 18:04:55 +08:00
jonas@perch.ndb.mysql.com
b1d87126bf Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-08-15 09:39:26 +02:00
stewart@willster.(none)
0d7beacf31 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2006-08-15 11:28:27 +08:00
justin.he@qa3-104.qa.cn.tlan
9d6de5c894 BUG#20848 2006-08-11 18:01:46 +08:00
justin.he@qa3-104.qa.cn.tlan
5e5084dde4 Merge qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0-ndb-bj
into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1-ndb-bj
2006-08-11 15:18:40 +08:00
justin.he@qa3-104.qa.cn.tlan
265b9cf6cd BUG#20848 SHOW STATUS LIKE 'NDB%' should be data nodes not storage nodes
use correct termninology
2006-08-11 15:10:08 +08:00
stewart@willster.(none)
9d2e6b8d23 BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
allow handler::info to return an error code (that will be returned to the user)
2006-08-10 22:55:20 +08:00
jonas@perch.ndb.mysql.com
29eaad6288 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-10 13:47:20 +02:00
mskold/marty@linux.site
c3da14f4c5 Merge mysql.com:/home/marty/MySQL/mysql-5.0
into  mysql.com:/home/marty/MySQL/mysql-5.1-ndb
2006-08-09 15:02:30 +02:00
mskold/marty@mysql.com/linux.site
9241fba4ae Merge mysql.com:/home/marty/MySQL/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-5.0
2006-08-08 14:42:05 +02:00
mskold/marty@mysql.com/linux.site
a922e328af bug #18184 SELECT ... FOR UPDATE does not work..: Added lockTuple call in close_scan 2006-08-08 12:22:23 +02:00
mskold/marty@mysql.com/linux.site
d7f8c331e1 Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit); 2006-08-07 14:48:54 +02:00
mskold/marty@mysql.com/linux.site
3c61424563 Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit); 2006-08-07 13:51:20 +02:00
ingo/istruewing@chilla.local
c20030ef26 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  chilla.local:/home/mydev/mysql-5.1-bug18775
2006-08-02 18:10:51 +02:00
ingo/istruewing@chilla.local
8e4c36ad4a Bug#18775 - Temporary table from alter table visible to other threads
Continued implementation of WL#1324 (table name to filename encoding)

The intermediate (not temporary) files of the new table
during ALTER TABLE was visible for SHOW TABLES. These
intermediate files are copies of the original table with
the changes done by ALTER TABLE. After all the data is
copied over from the original table, these files are renamed 
to the original tables file names. So they are not temporary 
files. They persist after ALTER TABLE, but just with another 
name.

In 5.0 the intermediate files are invisible for SHOW TABLES
because all file names beginning with "#sql" were suppressed.

This failed since 5.1.6 because even temporary table names were
converted when making file names from them. The prefix became
converted to "@0023sql". Converting the prefix during SHOW TABLES
would suppress the listing of user tables that start with "#sql".

The solution of the problem is to continue the implementation of
the table name to file name conversion feature. One requirement
is to suppress the conversion for temporary table names.

This change is straightforward for real temporary tables as there
is a function that creates temporary file names.

But the generated path names are located in TMPDIR and have no
relation to the internal table name. This cannot be used for
ALTER TABLE. Its intermediate files need to be in the same
directory as the old table files. And it is necessary to be
able to deduce the same path from the same table name repeatedly.

Consequently the intermediate table files must be handled like normal
tables. Their internal names shall start with tmp_file_prefix
(#sql) and they shall not be converted like normal table names.

I added a flags parameter to all relevant functions that are
called from ALTER TABLE. It is used to suppress the conversion
for the intermediate table files.

The outcome is that the suppression of #sql in SHOW TABLES
works again. It does not suppress user tables as these are
converted to @0023sql on file level.

This patch does also fix ALTER TABLE ... RENAME, which could not 
rename a table with non-ASCII characters in its name.

It does also fix the problem that a user could create a table like
`#sql-xxxx-yyyy`, where xxxx is mysqld's pid and yyyy is the thread
ID of some other thread, which prevented this thread from running 
ALTER TABLE.

Some of the above problems are mentioned in Bug 1405, which can
be closed with this patch.

This patch does also contain some minor fixes for other forgotten
conversions. Still known problems are reported as bugs 21370,
21373, and 21387.
2006-08-02 17:57:06 +02:00
kostja@bodhi.local
436e7a2dd9 Post-merge fixes. 2006-07-14 02:07:37 +04:00
kostja@bodhi.local
d7845b74db Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
2006-07-13 22:09:36 +04:00
kostja@bodhi.local
56353959e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-07-13 00:18:59 +04:00
mkindahl@dl145k.mysql.com
9415b24139 Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl
into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.1-merge
2006-07-11 12:17:19 +02:00