Commit graph

17510 commits

Author SHA1 Message Date
pekka@mysql.com
7f1268db2c ndb: failed update updated tuple version. crash at DbtupTrigger.cpp 1102 2004-12-03 15:00:56 +01:00
serg@serg.mylan
c0a4183b0c strings/decimal.c
decimal_round(d, -N) bug fixed
2004-12-03 13:23:58 +01:00
joreland@mysql.com
a88b7c8977 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-03 13:15:16 +01:00
serg@serg.mylan
44dce2673e strings/decimal.c
fixed broken d2ll
    added checks for correct test results
2004-12-03 13:04:03 +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
brian@avenger.(none)
c783380701 Resolving conflict. 2004-12-02 19:00:33 -08:00
brian@avenger.(none)
3854c5087b Syntax fix, plus an update for version. 2004-12-02 18:53:49 -08: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
serg@serg.mylan
835cf0f1e8 more decimail bugs fixed 2004-12-03 00:11:30 +01:00
serg@serg.mylan
3328c65597 syntax error fixed 2004-12-03 00:10:12 +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
guilhem@mysql.com
a4c248738e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2004-12-02 23:04:47 +01:00
guilhem@mysql.com
f3b577f591 Making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish. Normally this step is not long but it's still nice to be killable
(especially in case of bug like BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever").
2004-12-02 23:02:38 +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
brian@avenger.(none)
685ec1a688 Undoing change for the moment. 2004-12-02 11:39:26 -08: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
marko@hundin.mysql.fi
dd48953956 Many files:
Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
2004-12-02 19:45:07 +02: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
heikki@hundin.mysql.fi
3ca8c79ecf trx0xa.h:
Remove compiler errors from Jan's XA header by commenting the __P macros out
2004-12-02 17:40:50 +02: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
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
lenz@mysql.com
1ca4c95f0f Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-12-02 12:58:25 +01:00
hf@deer.(none)
733f33cc7c Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-02 15:38:53 +04:00
konstantin@mysql.com
dc4f845103 Fix for Bug#6377 "Password Generation Discrepancy" 2004-12-02 14:28:59 +03:00
ram@gw.mysql.r18.ru
3b111a9b42 A fix (bug #6878: Crash with engine=memory). 2004-12-02 15:06:15 +04:00
lenz@mysql.com
23829a3e9c Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-12-02 12:01:38 +01:00
ram@gw.mysql.r18.ru
980bd4a37c merge (fix for bug #6878: Crash with engine=memory) 2004-12-02 14:56:46 +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
7ed2753300 A fix (bug #6878: Crash with engine=memory). 2004-12-02 14:34:53 +04: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
50c02f463b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1-enum
2004-12-02 13:34:28 +04:00
tomas@poseidon.ndb.mysql.com
e02261feca mgmapi.cpp:
bug #6919
2004-12-02 09:34:27 +00:00