mskold@mysql.com
3791170159
Fix for bug#6935 table rename does not work with ndb tables
2004-12-06 14:51:10 +01:00
mskold@mysql.com
f6209be015
New fix for bug#6796 Wrong outcome of update operation of ndb table
2004-12-06 14:34:02 +01:00
mskold@mysql.com
75da2fb3f4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-12-06 14:15:52 +01:00
bar@mysql.com
8878c58fe2
Fixed thar proper charset was not set in Field_set::val_str()
2004-12-06 16:22:51 +04:00
lars@mysql.com
414591915c
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/bXXXX-4.1
2004-12-04 13:10:36 +01:00
bell@sanja.is.com.ua
a3ad1765a8
merge
2004-12-03 23:24:41 +02:00
bell@sanja.is.com.ua
b48ec20ac7
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2004-12-03 22:40:11 +02:00
bell@sanja.is.com.ua
734ffb8452
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
2004-12-03 22:13:53 +02:00
jimw@mysql.com
48fc4cbc6b
Merge
2004-12-03 17:48:19 +01:00
lars@mysql.com
f900433bbe
Due to a compiler bug, slave.cc:tables_ok() sometimes wrongly returns
...
1 if the return type is int or int_fast8_t. The test case that showed
this problem is rpl000001 and the tested version was MySQL 5.0.2. The
compiler with the problem is GCC 3.0.4 runing on "Linux bitch 2.4.18
#2 Thu Apr 11 14:37:17 EDT 2002 sparc64 unknown".
By changing the return type to bool the problem disappear. (Another
way to make the problem disappear is to simply print the returned
value with printf("%d",?). The printed returned value is always 0 in
the test cases I have run.) This is only a partial solution to the
problem, since someone could later change the return type of the
function back to int or some other type that does not work.
2004-12-03 15:18:25 +01:00
serg@serg.mylan
6a5267e15d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-03 15:05:35 +01:00
serg@serg.mylan
052665e1eb
sql/sql_class.h
...
Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
sql/sql_insert.cc
Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
2004-12-03 15:02:29 +01:00
mats@mysql.com
fe70f8c747
Merge mysql.com:/space/bkroot/mysql-4.1
...
into mysql.com:/space/bk/b6391-mysql-4.1
2004-12-03 12:15:31 +01:00
mats@mysql.com
2bbdf2403d
Bug#6391 (binlog-do-db rules ignored)
...
CREATE DATABASE statement used the current database instead of the
database created when checking conditions for replication.
CREATE/DROP/ALTER DATABASE statements are now replicated based on
the manipulated database.
2004-12-03 12:13:51 +01:00
jimw@mysql.com
08f771a0cc
Manual fixes to merge of fix for Bug #6682 to 4.1.
2004-12-03 02:44:33 +01:00
jimw@mysql.com
4b8e96d5ca
Merge
2004-12-03 00:39:55 +01:00
jimw@mysql.com
13649d90ae
Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the
...
insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682 )
(Original fix reimplemented after review by Serg and Guilhem.)
2004-12-03 00:05:11 +01:00
serg@serg.mylan
3ce8209994
compatibility fix
2004-12-02 20:53:54 +01:00
marko@hundin.mysql.fi
8dba38fe7a
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-12-02 16:14:37 +02:00
mskold@mysql.com
cca3fc671f
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-12-02 14:25:55 +01:00
monty@mysql.com
985400e0f5
merge (new code fixed the ALTER TABLE problem)
2004-12-02 15:14:01 +02:00
monty@mysql.com
55cc515c8f
merged on pull
2004-12-02 14:47:14 +02:00
monty@mysql.com
d1a666d59a
Cleanups during review stage
...
Added auto-correct of field length for enum/set tables for ALTER TABLE
This is becasue of a bug in previous MySQL 4.1 versions where the length for enum/set was set incorrectly after ALTER TABLE
2004-12-02 14:43:51 +02:00
hf@deer.(none)
71bfbbdcd0
Fixes to make mysql-test-run --embedded-server working
2004-12-02 16:08:17 +04:00
marko@hundin.mysql.fi
89996cd7ad
mysqld.cc:
...
innodb_autoextend_increment: set a maximum limit of 1000 (Bug #6904 )
2004-12-02 12:40:25 +02:00
ram@gw.mysql.r18.ru
c78eefbc95
Fixes (bug #6932 : 'revoke all privileges...' doesn't remove all proper columns from columns_priv
...
bug #6933 : error in the tests/grant.pl test).
2004-12-02 13:34:30 +04:00
bar@mysql.com
a09a603d83
Bug #6379 : ENUM values are incorrectly converted
...
- add_field_to_list() now uses <List>String
instead of TYPELIB to be able to distinguish
literals 'aaa' and hex literals 0xaabbcc.
- move some code from add_field_to_list() where
we don't know column charset yet, to
mysql_prepare_table(), where we do.
2004-12-02 12:48:43 +04:00
bar@mysql.com
015b6f4136
Bug #6815 SHOW CREATE TABLE hangs after upgrading to 4.1
...
A test doesn't seem to be possible.
2004-12-02 11:39:50 +04:00
bell@sanja.is.com.ua
4c017d18e2
Merge
2004-12-01 10:25:11 +02:00
mskold@mysql.com
da1f5728fd
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-12-01 09:22:26 +01:00
guilhem@mysql.com
81609d6e1c
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-30 22:22:12 +01:00
guilhem@mysql.com
7219d2be90
two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever"
...
(originally reported as "second run of innobackup hangs forever and can even hang server").
Plus testcase for the bugfix and comments about global read locks.
2004-11-30 22:20:52 +01:00
tomas@poseidon.ndb.mysql.com
900e507b14
fixed so that warning on missing support for engine only printed once even if option given multiple times
2004-11-30 20:51:57 +00:00
bell@sanja.is.com.ua
f20e7a82b7
now we create temporary join for all queries with subqueries to make correct cleunup of tables and avoid too early unlock (BUG#6841)
2004-11-30 21:41:12 +02: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
marko@hundin.mysql.fi
97406b377c
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-11-30 17:48:30 +02:00
tomas@poseidon.ndb.mysql.com
922c9146cd
use sql_print_warning instead of push_warning in mysqld.cc
2004-11-30 15:48:29 +00:00
marko@hundin.mysql.fi
a35a93aa3c
InnoDB: Allow ALTER TABLE to do intermediate COMMIT also when the table
...
contains auto_increment columns. (Bug #6633 )
2004-11-30 17:34:37 +02:00
tomas@poseidon.ndb.mysql.com
2d1458ea5b
mysqld.cc:
...
fixed erroneous previous push
2004-11-30 14:52:05 +00:00
tomas@poseidon.ndb.mysql.com
559f33b2e2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-30 12:17:21 +00:00
ram@gw.mysql.r18.ru
c15b45df50
Portability fix. Why not to use UINT_MAX32 here?
2004-11-30 15:10:48 +04:00
tomas@poseidon.ndb.mysql.com
d209371a46
mysqld.cc:
...
fixed typo
2004-11-30 10:22:50 +00:00
tomas@poseidon.ndb.mysql.com
91aec87086
add warnings for INNODB,BDB,ISAM being unavailable if switch to use is supplied, i.e. --bdb,--isam,--innodb
2004-11-30 09:22:33 +00:00
tomas@poseidon.ndb.mysql.com
2d5711b8d5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-30 08:41:59 +00:00
tomas@poseidon.ndb.mysql.com
f3e201886a
added use of mysql_cluster in mysqld (e.g. for ndb-connectstring)
...
added warning printout if --ndbcluster switch is given in a "non-cluster" binary
2004-11-30 08:41:16 +00:00
mskold@mysql.com
18afa572f6
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-30 07:47:52 +01:00
joreland@mysql.com
4ba04a3d6e
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-30 07:44:11 +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
jani@a193-229-222-105.elisa-laajakaista.fi
b09068f8a4
Applied some Netware related patches.
2004-11-29 17:41:47 +02:00