Commit graph

16295 commits

Author SHA1 Message Date
matthias@three.local.lan
2d90fe51b1 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-09 11:24:46 +01:00
tomas@poseidon.ndb.mysql.com
bf72f5daaa Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-08 23:00:57 +00:00
tomas@poseidon.ndb.mysql.com
11e0481955 added possibility for comment into management client
added sleep command to management client
all for testing purposes
2004-12-08 23:00:08 +00:00
tomas@poseidon.ndb.mysql.com
be4de23f3c ndbcluster.sh:
made compare of logs possible in ndb test
restart_log.result, restart.test, restart.result:
  new file
2004-12-08 22:56:23 +00:00
tomas@poseidon.ndb.mysql.com
798d933bb3 ndbcluster.sh:
added test switch
basic_log.result, basic.test, basic.result:
  new file
2004-12-08 21:48:32 +00:00
konstantin@mysql.com
356005efd7 A fix and test case for Bug#6873 "PS, having with subquery, crash
during execute"
2004-12-09 00:37:17 +03:00
lenz@mysql.com
c09c191121 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-12-08 19:35:04 +01:00
lenz@mysql.com
5a813ad546 - added two new options to Do-compile:
--ps-test: run the test suite using prepared statements
  --embedded-test: run the test suite against the embedded server
2004-12-08 19:34:11 +01:00
tomas@poseidon.ndb.mysql.com
bd52833d63 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-08 17:24:55 +00:00
heikki@hundin.mysql.fi
a90b40fcd3 os0file.c:
Print a better error message to the .err log if InnoDB's advisory file locking fails
2004-12-08 17:53:01 +02:00
tomas@poseidon.ndb.mysql.com
02dab28517 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-08 14:25:36 +00:00
tomas@poseidon.ndb.mysql.com
c2c618332e bug #7104
+ some extra debug printouts
2004-12-08 14:24:59 +00:00
stewart@mysql.com
3519e554e7 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb-pristine
2004-12-08 11:11:20 +11:00
konstantin@mysql.com
b40fc58245 A followup to Bug#6878 "Crash with engine=memory", reported as Bug#6986
""show_check" fails on 64bit platforms": now minimal rec_length
of a HEAP table >= sizeof(void*), hence it's platform-dependant.
2004-12-08 01:34:50 +03:00
serg@serg.mylan
36cee4b4d9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-07 21:43:12 +01:00
serg@serg.mylan
36e80455f5 allocate a buffer large enough for a longer matching string 2004-12-07 21:41:29 +01:00
jani@ua141d10.elisa.omakaista.fi
aac5f57b4d Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2004-12-07 21:58:26 +02:00
jani@ua141d10.elisa.omakaista.fi
e554642528 Fixed Bug#7043, "SHOW CREATE TABLE security hole". 2004-12-07 21:57:54 +02:00
bell@sanja.is.com.ua
acbca25dd2 postreview fix 2004-12-07 21:18:15 +02:00
bell@sanja.is.com.ua
45ac6cf81a Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-12-07 19:32:16 +02:00
Sinisa@sinisa.nasamreza.org
a017778493 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-12-07 19:16:00 +02:00
Sinisa@sinisa.nasamreza.org
a90da35fe6 Fix for a bug #6996 2004-12-07 19:12:29 +02:00
matthias@three.local.lan
ddd4398799 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-07 17:18:49 +01:00
mskold@mysql.com
c21302ca1e 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-07 17:11:32 +01:00
mskold@mysql.com
7561161360 Added missing ; 2004-12-07 17:10:42 +01:00
ram@gw.mysql.r18.ru
9d0c4e8e89 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6993
2004-12-07 19:39:47 +04:00
tomas@poseidon.ndb.mysql.com
cd83373141 added returntype BaseString& for ndb_upper and ndb_lower instead of void
uppercase printout
2004-12-07 15:39:46 +00:00
tomas@poseidon.ndb.mysql.com
5ede4c653a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-07 15:23:31 +00:00
ram@gw.mysql.r18.ru
83f3d06f36 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6993
2004-12-07 18:25:12 +04:00
bar@mysql.com
5e597e2670 #7066 [Ver]: "ctype_ucs" fails on SGI IRIX 2004-12-07 17:01:46 +04:00
bell@sanja.is.com.ua
562ec49290 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-12-07 14:18:14 +02:00
gluh@gluh.mysql.r18.ru
c946d4dd7b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
2004-12-07 15:18:13 +03:00
gluh@gluh.mysql.r18.ru
8c8f1886a0 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6077
2004-12-07 15:14:28 +03:00
gluh@gluh.mysql.r18.ru
8d70b2fc2b merge fix 2004-12-07 15:13:47 +03:00
gluh@gluh.mysql.r18.ru
069438d1bb Fix for bug #6840: Default value is not checked in ALTER column SET DEFAULT 'x' 2004-12-07 14:08:56 +03:00
gluh@gluh.mysql.r18.ru
f2fa6fd343 merge 2004-12-07 13:56:48 +03:00
ram@gw.mysql.r18.ru
f449ba85e8 A fix (bug #6993: Max myisam_data_pointer_size limited to 7). 2004-12-07 14:51:13 +04:00
mskold@mysql.com
4458722f55 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-07 10:31:55 +01:00
mskold@mysql.com
885a9d6ef5 Removed getTableForAlteration 2004-12-07 10:27:22 +01:00
tomas@poseidon.ndb.mysql.com
1b9e16f119 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-12-07 09:12:34 +00:00
tomas@poseidon.ndb.mysql.com
2677c34b82 fixed clusterlog "filter" command 2004-12-07 09:11:50 +00:00
hf@deer.(none)
477093eb8b Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.6755
2004-12-07 11:20:11 +04:00
bell@sanja.is.com.ua
b218560604 merge 2004-12-07 09:07:37 +02:00
stewart@mysql.com
ea0949a78a Fix segmentation fault on incorrect configuration.
Starting ndb_mgmd on a host which isn't in the configuration file as the ndb_mgmd 
(e.g. the ip address is different) would have ndb_mgmd segfault.

There was a check in the code, but it was (potentially) trying to dereference null
2004-12-07 15:49:54 +11:00
brian@avenger.(none)
f30049f411 Fix for crummy compiler that didn't udnerstand for declaration. Another fix for example storage engine to pass, not skip, test. 2004-12-06 16:26:05 -08:00
mskold@mysql.com
36a16ffb0a 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 22:58:15 +01:00
bar@mysql.com
248a968581 UCS2 support in ENUM and SET, which also fixes:
Bug #5174 SHOW CREATE TABLE hangs up if the table contains half-with katakana enum values
UCS2 values are stored in HEX encoding in FRM file
2004-12-06 20:45:32 +04:00
ram@gw.mysql.r18.ru
878dd8ba0a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5823
2004-12-06 20:45:31 +04:00
gluh@gluh.mysql.r18.ru
2775350d92 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
2004-12-06 19:45:30 +03:00
gluh@gluh.mysql.r18.ru
2686161c00 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
2004-12-06 19:03:39 +03:00