Commit graph

22910 commits

Author SHA1 Message Date
antony@ltantony.mysql.com
9eaf381d03 FreeBSD doesn't have /proc/cpuinfo, use sysctl to find cpu model. 2005-05-08 01:18:19 +01:00
antony@ltantony.mysql.com
7a56977a79 Bug#6925
Comment/*COMMENT*/is not a separator
  Ensure that whitespace is inserted after C-style comment if required.
2005-05-08 00:13:35 +01:00
antony@ltantony.mysql.com
3dce5fa432 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-5.0
2005-05-07 22:58:09 +01:00
jimw@mysql.com
d1a745b0ba Add special error message for .frm files with an un-understood version, like
those from 5.0 with new datatypes. (Bug #10435)
2005-05-07 13:57:22 -07:00
mskold@mysql.com
bea71274f7 Merge 2005-05-07 22:49:04 +02:00
mskold@mysql.com
89d8290eb3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-05-07 22:48:16 +02:00
mskold@mysql.com
a785052d7d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-07 22:44:49 +02:00
mskold@mysql.com
1eaa54a4d8 Removed double cond_push 2005-05-07 22:41:30 +02:00
mwagner@ultrafly.mysql.com
9f92bd5e25 Merge bk-internal:/home/bk/mysql-4.0
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.0
2005-05-07 22:08:05 +02:00
mskold@mysql.com
cb8d2905aa bug#9813: Post review fixes 2005-05-07 22:04:52 +02:00
lenz@mysql.com
f09fc52bc4 - Windows compile fix for ha_blackhole.cc - use #include "mysql_priv.h" instead of
#include <mysql_priv.h>
2005-05-07 22:04:10 +02:00
brian@brian-akers-computer.local
39f4e5755d Patch for --insert-ignore 2005-05-07 09:49:39 -07:00
svoj@mysql.com
f0841a2771 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/svoj/devel/mysql/7709-mysql-4.0
2005-05-07 21:39:29 +05:00
joreland@mysql.com
b15f8bcbaf Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:39:10 +02:00
joreland@mysql.com
0eb9947ce8 merge 2005-05-07 18:37:59 +02:00
svoj@mysql.com
fc3ff35be6 Test fix. DROP TABLE added. 2005-05-07 21:37:27 +05:00
joreland@mysql.com
5455e9ddd9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:28:18 +02:00
joerg@trift-lap.fambruehe
25cf90edbd Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into trift-lap.fambruehe:/MySQL/M50/mysql-5.0
2005-05-07 18:23:36 +02:00
joreland@mysql.com
347c21fe42 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:22:51 +02:00
joreland@mysql.com
4d1804ebb1 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-07 18:21:36 +02:00
joreland@mysql.com
749129487e ndb - autotest
fix configs and scripts
2005-05-07 18:20:29 +02:00
joerg@trift-lap.fambruehe
84af50133b Corrections to test "sp", stored procedure "fib" (see entry 9937 in the bug DB). 2005-05-07 18:06:02 +02:00
antony@ltantony.mysql.com
4fe845e8d0 Merge 2005-05-07 16:50:22 +01:00
jimw@mysql.com
17b6789cf2 Merge 2005-05-07 08:35:55 -07:00
gbichot@quadita2.mysql.com
a85ecdb670 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-07 17:26:01 +02:00
jimw@mysql.com
b4dcd8f4ab Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-07 08:26:00 -07:00
jimw@mysql.com
8c7d487ae7 Fix tests after merge 2005-05-07 08:25:59 -07:00
holyfoot@hf-ibm.(none)
a16a207456 Fix for embedded server to compile 2005-05-07 20:25:59 +05:00
ramil@mysql.com
3196a01039 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0
2005-05-07 20:25:58 +05:00
jimw@mysql.com
80933d9f95 Merge 2005-05-07 08:25:58 -07:00
gluh@mysql.com
3ce315ce33 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.10261
2005-05-07 15:25:57 +00:00
jimw@mysql.com
45058e100a Eliminate gcc 4.0 warning in libedit code. (Bug #9603) 2005-05-07 08:16:43 -07:00
gluh@mysql.com
f6bf2680b2 Fix for bug#10261: INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user
I_S table columns information is available for any user
2005-05-07 15:14:34 +00:00
jimw@mysql.com
17d02c5f2a Backport fix for escaping multibyte characters. (Bug #9864) 2005-05-07 07:50:04 -07:00
ndbdev@ndbmaster.mysql.com
e31a07265f ndb autotest - add show version to cpcd 2005-05-07 16:06:41 +02:00
antony@ltantony.mysql.com
fa8673a627 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
2005-05-07 14:55:49 +01:00
lenz@mysql.com
3f706b3d8d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-05-07 15:55:48 +02:00
jimw@mysql.com
d398b6eb51 Add support for slave_compressed_protocol, slave_load_tmpdir, and
slave_skip_errors in SHOW VARIABLES. (Bug #7800)
2005-05-07 06:55:47 -07:00
holyfoot@mysql.com
1d71dece3e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9527
2005-05-07 18:55:47 +05:00
gluh@mysql.com
64cbbf1463 Fix for bug #9838: INFORMATION_SCHEMA.COLUMNS columns of granted views missing 2005-05-07 13:55:46 +00:00
antony@ltantony.mysql.com
a5e9523364 Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug9666
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
2005-05-07 14:46:54 +01:00
antony@ltantony.mysql.com
687417be74 Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug9725
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
2005-05-07 14:43:03 +01:00
mwagner@ultrafly.mysql.com
ded73eddf7 errmsg.txt:
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
2005-05-07 15:11:31 +02:00
antony@ltantony.mysql.com
1af671bf36 Bug#9666 - Can't use 'DEFAULT FALSE' for column of type bool
Fix bug by moving TRUE/FALSE in with other literals.
2005-05-07 13:51:29 +01:00
antony@ltantony.mysql.com
1ebc9e37ea Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update"
INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
  Fix so that protocol doesn't break by properly ignoring dups.
2005-05-07 13:31:37 +01:00
antony@ltantony.mysql.com
06954a4f8b Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
2005-05-07 13:21:49 +01:00
gluh@mysql.com
a8febcd7d2 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9897
2005-05-07 12:21:48 +00:00
gluh@mysql.com
d76be7ab3f Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement
thd->lex->derived_tables should be zero(it may be changed if we open a view)
2005-05-07 12:17:54 +00:00
joreland@mysql.com
678bef34a8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 13:27:06 +02:00
joreland@mysql.com
85066eb0a2 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-07 13:25:52 +02:00