jani@a193-229-222-2.elisa-laajakaista.fi
c43084acac
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into a193-229-222-2.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2004-10-08 20:18:53 +03:00
jani@a193-229-222-2.elisa-laajakaista.fi
951e54df74
Changed a fatal error to a warning in case the default mysqld
...
binary for mysqld_multi was not found. This is because it is
possible to define one under each mysqldN group separately.
Bailing out if mysqld binary is not found at all.
Added option --silent to turn off warnings.
2004-10-08 20:18:25 +03:00
konstantin@mysql.com
234c80b689
Deployment of centralized Item change registry, step 2: Item_ref
...
doesn't need to have it's own recovery mechanism.
2004-10-08 19:13:09 +04:00
joerg@mysql.com
b0154e21dc
Solve compile problem - use system types like 'size_t'.
2004-10-08 15:00:36 +02:00
heikki@hundin.mysql.fi
b124ce5f64
Merge heikki@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-10-08 15:29:36 +03:00
heikki@hundin.mysql.fi
67ce68acb9
row0sel.c, row0row.c:
...
Fix bug #5975 about UTF-8 chars and prefix indexes; do not print warnings if a column prefix is > 255 bytes
2004-10-08 15:25:59 +03:00
magnus@neptunus.(none)
01c29fc921
BUG#5973 ndb table belonging to different database shows up in SHOW TABLES
2004-10-08 13:37:13 +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
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
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
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
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
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
rburnett@build.mysql.com
9954abef02
Merge build.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/rburnett/mysql-4.0
2004-10-06 22:03:20 +02:00
rburnett@build.mysql.com
4a01f3030b
Enabled the writing of a pid file on Windows.
...
mysqld.cc:
Added call to create_pid_file to start_signal_handler on windows. Also removed the #ifndef WINDOWS from two calls that deletes the pid file
2004-10-06 21:46:44 +02:00
monty@mysql.com
62f3cd6a31
Merge with 4.0 for 4.1 release
...
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
2004-10-06 19:14:33 +03:00
monty@mysql.com
97febc4dc4
Code cleanups while doing review of pushed code
2004-10-06 17:20:39 +03:00
tomas@poseidon.ndb.mysql.com
66923bf968
forgot to remove ndbrequire
2004-10-06 13:26:38 +00:00
tomas@poseidon.ndb.mysql.com
884892a650
bug#5736, subqueries and not in
...
and testcases
2004-10-06 13:18:55 +00:00
ram@gw.mysql.r18.ru
0944bed7fc
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5733
2004-10-06 12:49:56 +05:00
brian@brian-akers-computer.local
197ff3fac6
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-10-05 15:35:26 -07:00
monty@mysql.com
992b04d3d8
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-10-06 01:25:55 +03:00
monty@mysql.com
c27d22b44e
Reverted patch for new usage of open_count as it caused more problems than it solved
...
Cleaned up patch for checking locks for multi-table updates
2004-10-06 01:24:21 +03:00
lenz@mysql.com
7d4bd5fc96
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2004-10-05 20:33:48 +02:00
dlenev@mysql.com
96458f8f64
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bf
2004-10-05 21:24:08 +04:00