Commit graph

26559 commits

Author SHA1 Message Date
osku@127.(none)
93671fb91e Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql/5.0/clean
2005-09-23 16:46:59 +03:00
osku@127.(none)
d563a01afe Merge 127.(none):/home/osku/mysql/5.0/clean
into  127.(none):/home/osku/mysql/5.0/3443
2005-09-23 16:44:25 +03:00
osku@127.(none)
d61708d1c9 Fix bug #3443, better foreign key error messsages. 2005-09-23 16:22:27 +03:00
dlenev@mysql.com
3f9163b074 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-rmuqf
2005-09-23 17:03:49 +04:00
dlenev@mysql.com
b37c586ffe Fixed race conditions in rpl_multi_update and rpl_multi_delete tests which
caused spurious test failures.
2005-09-23 16:59:19 +04:00
msvensson@neptunus.(none)
22c1bb4e6d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-23 14:38:26 +02:00
msvensson@neptunus.(none)
d55eeed8fd Merge from 4.1 to 5.0 2005-09-23 14:37:22 +02:00
osku@127.(none)
06077eb1eb InnoDB: Minor fixes. 2005-09-23 14:31:31 +03:00
osku@127.(none)
945ea8a98b Merge 127.(none):/home/osku/mysql/5.0/clean
into  127.(none):/home/osku/mysql/5.0/13315
2005-09-23 11:22:05 +03:00
osku@127.(none)
e6b3261556 InnoDB: Fix bug #13315, index columns having a maximum length of 767. 2005-09-23 11:20:34 +03:00
msvensson@neptunus.(none)
02c7645cc1 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-23 09:18:56 +02:00
brian@zim.(none)
f5c00b0dbd Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/fix-5.0
2005-09-22 19:46:16 -07:00
brian@zim.(none)
8eea3e5be0 This fixed bug 13369. Note, I dislike goto's as well.
The alias structure now is a bit more simple and just uses a pointer to replace with the currect name. The giant case statement should go away in the next patch.
2005-09-22 16:58:09 -07:00
konstantin@mysql.com
2d4c54ba1b Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  mysql.com:/opt/local/work/mysql-5.0-root
2005-09-23 00:46:59 +04:00
msvensson@neptunus.(none)
4f03ab4943 Bug #13384 mysqltest, no protocol when script contains only lines with eval 2005-09-22 21:52:04 +02:00
msvensson@neptunus.(none)
4700631aa8 Bug #13384 mysqltest, no protocol when script contains only lines with eval 2005-09-22 21:24:57 +02:00
joerg@mysql.com
cb77a6accb Fixes needed to build 5.0.13 on Windows:
- reflect two "Makefile.am" changes in the respective "VC project" files,
- correct a typo in a (normally) unused macro parameter.
2005-09-22 18:57:07 +02:00
msvensson@neptunus.(none)
306dcf0620 Merge neptunus.(none):/home/msvensson/mysql/bug13164/my50-bug13164
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-22 12:29:11 +02:00
msvensson@neptunus.(none)
139601f997 Bug #13164 yassl: "SSL connection error" on several platforms
- it's a requirement fo yaSSL that either /dev/urandom or /dev/random is available on the target system.
 - Added a fix that tries to open /dev/random if /dev/urandom is not available.
2005-09-22 12:19:09 +02:00
marko@hundin.mysql.fi
ff8127ffaa InnoDB: correct two misleading comments 2005-09-22 13:09:14 +03:00
ramil@mysql.com
5cf4eb0e26 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b11553
2005-09-22 13:05:48 +05:00
ramil@mysql.com
8660ccd9e1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b11553
2005-09-22 12:53:37 +05:00
gluh@mysql.com
47807ba5ab Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Merge/4.1
2005-09-22 12:46:50 +05:00
gluh@eagle.intranet.mysql.r18.ru
88ef33e542 Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
set auto_increment_field_not_null to true to preserve zero values
  for autoincrement fields during LOAD DATA execution if 
  NO_AUTO_VALUE_ON_ZERO sql mode is set
2005-09-22 12:46:01 +05:00
jonas@perch.ndb.mysql.com
2a002fc1ef Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-22 09:20:23 +02:00
jonas@perch.ndb.mysql.com
1694447823 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 09:13:14 +02:00
jonas@perch.ndb.mysql.com
1f84a13977 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-22 09:10:11 +02:00
jonas@perch.ndb.mysql.com
f5761aa4e8 Add testcase for bug#13316
ndb big alter table
2005-09-22 09:09:27 +02:00
ramil@mysql.com
92306dd089 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b11553
2005-09-22 11:46:54 +05:00
ramil@mysql.com
66929c9540 a fix (#11553: gives error if aggregate user-defined function in HAVING clause). 2005-09-22 11:45:16 +05:00
ramil@mysql.com
d9eb8958a2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b11553
2005-09-22 11:39:01 +05:00
jonas@perch.ndb.mysql.com
ac29fd0051 bug#13316
ndb alter table with big dicttabinfo
  send alter_tab_req fragmented as signal can get larger than MAX_MESSAGE_SIZE
2005-09-22 08:35:27 +02:00
stewart@mysql.com
0d716ef8fa GCC4 build fix 2005-09-22 15:48:40 +10:00
jonas@perch.ndb.mysql.com
e84173a1eb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 07:19:09 +02:00
jonas@perch.ndb.mysql.com
36dae073b3 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 07:17:41 +02:00
jonas@perch.ndb.mysql.com
dfd8cecad1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-22 07:15:37 +02:00
jonas@perch.ndb.mysql.com
d25f763c2d Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-22 07:14:22 +02:00
jonas@perch.ndb.mysql.com
e02eb8d6e7 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-22 07:12:39 +02:00
jonas@perch.ndb.mysql.com
4009307f0b ndb - fix gcc4 compile problem 2005-09-22 07:11:53 +02:00
monty@mysql.com
82fc54781b Fixed problems found by valgrind
Fixed problems in test suite where some test failed
Fixed access to not initialized memory in federated
Fixed access to not initialized memory when using BIT fields in internal temporary tables
2005-09-22 03:23:07 +03:00
jimw@mysql.com
7ecafbb9f5 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-21 17:05:35 -07:00
evgen@moonbone.local
2ba1eb1486 Manual merge 2005-09-22 02:38:14 +04:00
jimw@mysql.com
bdb4502a78 Merge mysql.com:/home/jimw/my/mysql-4.1-zlib
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-21 15:17:48 -07:00
konstantin@mysql.com
6f8d3c4844 A fix and a test case for Bug#6513 "Test Suite: Values inserted by using
cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server
Crash while fetching from table with 5 million records."
A fix for a possible memory leak when fetching into an SP cursor
in a long loop.
The patch uses a common implementation of cursors in the binary protocol and 
in stored procedures and implements materialized cursors.
For implementation details, see comments in sql_cursor.cc
2005-09-22 02:11:21 +04:00
evgen@moonbone.local
5065d73ebb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13180-bug-4.1-mysql
2005-09-22 01:48:39 +04:00
evgen@moonbone.local
b7e8c8b112 Fix bug #13180 thd->allow_sum_funcs wasn't reset before query processing.
thd->allow_sum_func was left 'true' after previous statement thus allowing
sum funcs to be present in conditions.

thd->allow_sum_func should be set to 0 for each query and each prepared
statement reinitialization. This is done in lex_start() and 
reset_stmt_for_execute().
2005-09-22 01:38:39 +04:00
shuichi@mysql.com
a5a4c412f1 Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/shuichi/apps/mysql/bk/mysql-5.0b
2005-09-21 11:18:04 -07:00
sergefp@mysql.com
2b528d8364 Fix compiler error: C++ code in C 2005-09-21 19:58:40 +04:00
timour@mysql.com
ba9e3ca1a4 Merge mysql.com:/home/timka/mysql/src/4.1-virgin
into  mysql.com:/home/timka/mysql/src/4.1-dbg
2005-09-21 18:58:39 +03:00
jonas@perch.ndb.mysql.com
e50c49b2b9 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-21 17:58:38 +02:00