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
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
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
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
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
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
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
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
tsmith@build.mysql.com
075a887995
mysqld_safe.sh:
...
Fix calls to my_print_defaults. Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option.
NOTE: this may make some installations behave differently, if they depend on this broken behavior.
2004-11-30 22:17:43 +01:00
marko@hundin.mysql.fi
ef2a73783e
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-11-30 23:12:12 +02:00
marko@hundin.mysql.fi
2cb2461229
lock0lock.h:
...
Rename lock_table_exclusive to lock_is_table_exclusive
(somehow this change was omitted from last changeset)
2004-11-30 23:10:17 +02:00
serg@serg.mylan
7a74b75945
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-30 21:51:58 +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
serg@serg.mylan
8551a482e2
typo fixed
2004-11-30 21:17:03 +01: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
d365446f62
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:52:30 +02:00
heikki@hundin.mysql.fi
12738cd23a
lock0lock.c:
...
If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
2004-11-30 17:51:10 +02:00
marko@hundin.mysql.fi
b8028e6a0d
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:50:56 +02:00
heikki@hundin.mysql.fi
c7ed52456d
row0sel.c:
...
Remove compiler warning as I had forgotten an include file
2004-11-30 17:48:30 +02: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
abb50b38ee
ps_7ndb.result, ps_7ndb.test:
...
ndb now runs ps tests just like the others
2004-11-30 15:08:26 +00:00
tomas@poseidon.ndb.mysql.com
2d1458ea5b
mysqld.cc:
...
fixed erroneous previous push
2004-11-30 14:52:05 +00:00