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
serg@serg.mylan
9c23871867
help text corrected
2004-12-04 10:06:38 +01:00
bell@sanja.is.com.ua
1b07e3b2db
postreview fixes
2004-12-04 00:14:18 +02:00
guilhem@mysql.com
9047fe456b
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-12-03 23:09:18 +01:00
guilhem@mysql.com
ba5bc4e69a
Fix for BUG#6671 "mysqlbinlog does not show thread_id for LOAD DATA INFILE"
...
(exactly, for the bug in 4.1 reported in this bug report). We just make
Load_log_event work like Query_log_event for temp tables.
2004-12-03 23:07:08 +01:00
tomas@poseidon.ndb.mysql.com
ee3953c5c1
added configure option to control extra ndb debug options,
...
for release debug build please configure with --without-ndb-debug
2004-12-03 21:26:14 +00: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
5c29de39bd
Fix t/rpl_create_database.test: replace version in SHOW BINLOG RESULTS
2004-12-03 18:42:35 +01:00
jimw@mysql.com
48fc4cbc6b
Merge
2004-12-03 17:48:19 +01:00
serg@serg.mylan
b00395fca8
compatibility fix (2G filesize limit)
2004-12-03 17:35:50 +01:00
joreland@mysql.com
d08053b2a2
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-03 16:10:20 +01:00
serg@serg.mylan
2cf8e2506c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-03 15:43:26 +01:00
joreland@mysql.com
6a9b2453a1
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-03 15:38:07 +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
joreland@mysql.com
06e70758e7
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-03 15:04:06 +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
joreland@mysql.com
c9925aeb72
ndb - fix in test suite
2004-12-03 15:02:07 +01:00
pekka@mysql.com
95deea9c70
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2004-12-03 15:00:57 +01:00
pekka@mysql.com
7f1268db2c
ndb: failed update updated tuple version. crash at DbtupTrigger.cpp 1102
2004-12-03 15:00:56 +01:00
wax@mysql.com
95c886dac4
Merge mysql.com:/home/wax/mysql/mysql-4.1
...
into mysql.com:/home/wax/mysql/mysql-4.1testtemp
2004-12-03 17:03:24 +05:00
wax@kishkin.ru
f3bdd0312b
added project files of mysqltest and mysql_test_run_new
2004-12-03 16:59:49 +05:00
joreland@mysql.com
2e9319eb35
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-03 12:51:38 +01:00
joreland@mysql.com
a6c814e4f7
ndb - fix abort of scan when in WAIT_AI_SCAN state
2004-12-03 12:45:51 +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
lenz@mysql.com
eb6c38fe9c
- updated lowercase_table3 test result (T1.InnoDB -> T1.ibd). Failure was
...
discovered on Mac OS X
2004-12-02 21:32:36 +01:00
serg@serg.mylan
3ce8209994
compatibility fix
2004-12-02 20:53:54 +01:00
lenz@mysql.com
7dd3d47753
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-12-02 19:11:35 +01:00
joerg@mysql.com
4545e64495
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1
2004-12-02 18:56:58 +01:00
lenz@mysql.com
e810be1126
- added option --with-archive to enable compiling with the Archive Storage
...
Engine
2004-12-02 18:55:10 +01:00
rburnett@build.mysql.com
4278e6194b
Bug #6697 Failure to build 4.1.7 on Visual Studio .NET [fixed]
...
mysqld.dsp:
Added custom build step for message.mc to all targets
2004-12-02 18:05:37 +01:00
joerg@mysql.com
9150971bac
Change to prevent the failure of "make distclean" on the missing 'regex/Makefile' (and, later, 'strings/Makefile').
2004-12-02 16:42:37 +01:00
lenz@mysql.com
52a7174d93
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-12-02 16:30:34 +01:00
tsmith@build.mysql.com
a7255a3277
Merge bk-internal:/home/bk/mysql-4.1
...
into build.mysql.com:/users/tsmith/m/41/b
2004-12-02 15:48:02 +01:00
tsmith@build.mysql.com
88f48f33c5
Merge bk-internal:/home/bk/mysql-4.1
...
into build.mysql.com:/users/tsmith/m/41/b
2004-12-02 15:33:12 +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
serg@serg.mylan
da92505db7
myisam/mi_packrec.c
...
more robust checks (catch more corruptions)
2004-12-02 15:14:36 +01: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
serg@serg.mylan
dfc205906c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-02 14:14:02 +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
hf@deer.(none)
c7ef44857f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-02 16:46:30 +04: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