Commit graph

16178 commits

Author SHA1 Message Date
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
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
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
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
lenz@mysql.com
c7038d1df6 - fixed file permissions (need execute bits set) 2004-12-02 10:11:28 +01: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
lenz@mysql.com
3247f0051d - added some BUILD/compile-ppc* build scripts to ease building on LinuxPPC
- added ppc_cflags to BUILD/SETUP.sh
2004-12-02 09:44:03 +01: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
serg@serg.mylan
dd7ff9335a one more test for corrupted compressed MyISAM table 2004-12-01 22:46:39 +01:00
heikki@hundin.mysql.fi
227ffeb9e0 configure.in:
Let MySQL check the existence of readdir_r with 3 arguments; Solaris seems to have just 2 args
  Check the existence of readdir_r and localtime_r; even though MySQL does check these too, we need our own check for Hot Backup code
os0file.c:
  Use re-entrant readdir_r where available
ut0ut.c:
  Make a function to use thread-safe localtime_r where available; that particular function was not called from anywhere, though
2004-12-01 18:02:34 +02:00
bar@mysql.com
a38160f370 Move common trailing space checks into an include file.
Check UCS2 trailing spaces.
2004-12-01 19:25:05 +04:00
joreland@mysql.com
0718f788d6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-01 10:15:25 +01:00
joreland@mysql.com
64d6563afa Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-01 10:13:55 +01:00
joreland@mysql.com
9acd3ea38d testcase for bug#6871, ndb, replace with collations 2004-12-01 10:13:18 +01:00
joreland@mysql.com
d1a139cb24 bug#6871 - ndb
replace with charsets
  check update of primary key wo/ normalizing
2004-12-01 10:04:49 +01:00
mwagner@mysql.com
2e0d1b3f9c openssl_1.result, have_openssl_1.require, openssl_1.test:
Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
2004-12-01 02:35:02 +01:00
guilhem@mysql.com
5caa586d56 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-30 22:50:40 +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