Commit graph

15161 commits

Author SHA1 Message Date
joreland@mysql.com
20e5bfe839 wl 1801
Testcases for NF
2004-10-08 17:44:20 +02:00
joreland@mysql.com
46b2eae096 Test prg update
- make test node restart test harder
2004-10-08 16:42:51 +02:00
joreland@mysql.com
07359aef31 hmm. a bit trigger happy.
on the real table readTuple is needed
2004-10-08 11:35:56 +02:00
joreland@mysql.com
2662bba1aa Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-08 11:09:01 +02:00
joreland@mysql.com
fe7e87882a Let blobs use committedRead, this is always correct as
as read lock is held on primary table
2004-10-08 11:06:44 +02:00
joreland@mysql.com
ea21d7c936 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-08 10:26:23 +02:00
joreland@mysql.com
087a694f65 Fix simple/dirty read handling 2004-10-08 09:43:38 +02:00
kent@mysql.com
05c01360e3 Makefile.am, client_test.test, mysql-test-run.sh:
To make client_test work as mysql-test-run test case, needs to install it
2004-10-08 01:39:20 +02:00
konstantin@mysql.com
d7bda287de Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-5748-anew
2004-10-08 02:22:40 +04:00
konstantin@mysql.com
2aa7ec0d9d A fix for Bug#5748 "Prepared statement with BETWEEN and bigint values
crashes mysqld": implementation for a generic item tree modifications
registry. Every item tree modification which should be rolled back for
subsequent execution of a prepared statement or stored procedure should
be saved in the registry. All such modifications are rolled back at once
during cleanup stage of PS.
Actual fix for the bug just adds a call to register modifications to
convert_constant_item.
Post review fixes implemented.
2004-10-08 02:21:19 +04:00
jani@a80-186-41-201.elisa-laajakaista.fi
4ec44183e2 Fixed a bug in --log option. 2004-10-07 23:51:47 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
a37355fb98 Added option --sigint-ignore to mysql.cc 2004-10-07 22:47:11 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
724749e9a7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into a80-186-41-201.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2004-10-07 22:09:14 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
a44b6b67a5 Fixed a bug in password handling. All related to Bug#5955. 2004-10-07 22:08:17 +03:00
heikki@hundin.mysql.fi
89ecfd7fa6 Many files:
Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
2004-10-07 20:53:20 +03:00
magnus@neptunus.(none)
b40082ceee Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
2004-10-07 19:00:08 +02:00
tomas@poseidon.ndb.mysql.com
db93dd1e3c ha_ndbcluster.cc:
merge error
2004-10-07 17:00:07 +00:00
tomas@poseidon.ndb.mysql.com
0d5c9fb910 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-10-07 16:57:53 +00:00
lenz@mysql.com
7c18f064e6 - removed the Docs/Flags and Docs/RawFlags directories
- Updated Docs/Makefile.am and scripts/make_win_src_distribution.sh
   accordingly
2004-10-07 18:30:56 +02:00
lenz@mysql.com
983bb74cda Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-10-07 18:30:55 +02:00
tomas@poseidon.ndb.mysql.com
1dd43fab87 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-07 16:30:54 +00:00
tomas@poseidon.ndb.mysql.com
69f40808e2 ndb_alter_table.result, ndb_alter_table.test:
...
2004-10-07 16:30:21 +00:00
tomas@poseidon.ndb.mysql.com
9035aab33c fixed bug where scan is not closed as it should 2004-10-07 16:01:41 +00:00
magnus@neptunus.(none)
86918cd1fc Protect from use of NULL pointer 2004-10-07 17:59:37 +02:00
magnus@neptunus.(none)
d167c09834 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
2004-10-07 15:42:56 +02:00
tomas@poseidon.ndb.mysql.com
6f0dc0f48e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-07 13:42:55 +00:00
heikki@hundin.mysql.fi
784445a4ef ha_innodb.cc:
Merge manually the InnoDB mysqldump -l crash patch (crash with LOCK TABLES ... LOCAL) from 4.0 to 4.1; some code cleanup
2004-10-07 16:08:15 +03:00
lenz@mysql.com
5037b95f81 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-10-07 14:43:09 +02:00
monty@mysql.com
b751796aa2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-10-07 15:43:08 +03:00
tomas@poseidon.ndb.mysql.com
294bcf2cc0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-07 12:43:07 +00:00
tomas@poseidon.ndb.mysql.com
a257686692 more order by fixes 2004-10-07 12:36:37 +00:00
magnus@neptunus.(none)
d55efe332d Sned original NDB error as warning to client 2004-10-07 14:19:46 +02:00
joerg@mysql.com
a9fc6cfd31 Correct an 'unresolved identifier' problem caused by an "inline"
function being used before it was defined - "forward" declaration
was insufficient.
2004-10-07 12:02:22 +02:00
magnus@neptunus.(none)
ac9016df91 Initialise "sorted" variable in constructor of QUICK_SELECT. The variable is set to 1 in test_if_skip_sort_order if we decide to optimize "order by" by uinsg index_read. 2004-10-07 11:57:48 +02:00
magnus@neptunus.(none)
6bbf1f8ee4 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
2004-10-07 11:57:47 +02:00
tomas@poseidon.ndb.mysql.com
0ac2c35fe9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-07 09:57:46 +00:00
monty@mysql.com
1dd4bd5f6c Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-10-07 12:51:32 +03:00
dlenev@mysql.com
e5483ab3bd Manual merge of tree containing fix for bug #5915 "ALTER TABLE behaves
differently when converting column to auto_increment in 4.1" with
current tree.
2004-10-07 13:51:32 +04:00
monty@mysql.com
01232b2c52 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-10-07 12:51:31 +03:00
tomas@poseidon.ndb.mysql.com
4afccd761b more order by for ndb 2004-10-07 09:51:30 +00:00
monty@mysql.com
546c2bd6ab Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-10-07 12:37:21 +03:00
tomas@poseidon.ndb.mysql.com
a03001155b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-07 09:37:20 +00:00
tomas@poseidon.ndb.mysql.com
690cdfc697 added order by to give same order results on different endian and different sized clusters 2004-10-07 09:27:39 +00:00
dlenev@brandersnatch.localdomain
1f54900630 Fix for bug #5915 "ALTER TABLE behaves differently when converting column
to auto_increment in 4.1".
Now we are enforcing NO_AUTO_VALUE_ON_ZERO mode during ALTER TABLE only
if we are converting one auto_increment column to another auto_increment
column (this also includes most common case when we don't do anything
with such column).

Also now when we convert some column to TIMESTAMP NOT NULL column with
ALTER TABLE we convert NULL values to current timestamp, (as we do this
in INSERT). One can still get old behavior by setting system TIMESTAMP
variable to 0.
2004-10-07 13:02:39 +04:00
brian@brian-akers-computer.local
b7f8285cd9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-10-07 01:42:12 -07:00
tomas@poseidon.ndb.mysql.com
a8d2692c65 adder order by 2004-10-07 08:42:11 +00:00
monty@mysql.com
6239edc1d1 After merge fixes
Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code
2004-10-07 10:50:13 +03:00
magnus@neptunus.(none)
6985bcd59d Don't show NDB$BLOB tables in SHOW TABLES 2004-10-07 09:16:46 +02:00
magnus@neptunus.(none)
551cbfe0c6 Fix error message 2004-10-07 09:09:18 +02:00
brian@brian-akers-computer.local
c9e6ad2cc1 Clean up from Bar and Antony code review. Found an issue with the header file were it could end up corrupted. 2004-10-06 23:26:40 -07:00