Commit graph

39353 commits

Author SHA1 Message Date
gkodinov@dl145s.mysql.com
c77fae407b Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-19 15:04:12 +02:00
mskold/marty@mysql.com/linux.site
b97dff67c9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-10-19 15:00:46 +02:00
mskold/marty@mysql.com/linux.site
3a4ca6d736 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
2006-10-19 14:58:43 +02:00
mskold/marty@mysql.com/linux.site
240cd87dbf Bug #21072 Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key: Added string initialization 2006-10-19 14:57:04 +02:00
gkodinov@dl145s.mysql.com
892495acaf Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-19 14:37:49 +02:00
svoj@mysql.com/april.(none)
d2fa9fd192 Merge mysql.com:/home/svoj/devel/mysql/BUG23175/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
2006-10-19 17:35:09 +05:00
gkodinov@dl145s.mysql.com
1dacdd4c85 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-10-19 14:34:56 +02:00
svoj@mysql.com/april.(none)
b6f909bf1b Merge mysql.com:/home/svoj/devel/mysql/BUG22562/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
2006-10-19 17:33:22 +05:00
istruewing@chilla.local
8eee765441 Merge chilla.local:/home/mydev/mysql-5.0-merge
into  chilla.local:/home/mydev/mysql-5.1-merge
2006-10-19 13:43:57 +02:00
istruewing@chilla.local
9b3e7bd02f Bug#21476 - Lost Database Connection During Query
Backport from 5.1.
Raised STACK_MIN_SIZE for Debian GNU/Linux Sid,
Linux kernel 2.6.16,
gcc version 3.3.6 (Debian 1:3.3.6-13),
libc6-dbg 2.3.6.ds1-4,
Pentium4 (x86),
BUILD/compile-pentium-debug-max
Raised about 100 Bytes above the required minimum.
2006-10-19 13:42:26 +02:00
holyfoot/hf@mysql.com/deer.(none)
ff25d2b71a libmysqld/Makefile.am fixed 2006-10-19 16:39:24 +05:00
kroki/tomash@moonlight.intranet
dea0028cd9 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21856
2006-10-19 14:53:50 +04:00
kroki/tomash@moonlight.intranet
2a857d2fb3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21856
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21856
2006-10-19 14:49:16 +04:00
kroki/tomash@moonlight.intranet
00b2fc6aff BUG#21856: Prepared Statements: crash if bad create
When statement to be prepared contained CREATE PROCEDURE, CREATE FUNCTION
or CREATE TRIGGER statements with a syntax error in it, the preparation
would fail with syntax error message, but the memory could be corrupted.

The problem occurred because we switch memroot when parse stored
routine or trigger definitions, and on parse error we restored the
original memroot only after performing some memory operations.  In more
detail:
 - prepared statement would activate its own memory root to parse
   the definition of the stored procedure.
 - SP would reset this memory root with its own memory root to
   parse SP statements
 - a syntax error would happen
 - prepared statement would restore the original memory root
 - stored procedure would restore what it thinks was the original
   memory root, but actually was the statement memory root.
That led to double free - in destruction of the statement and in
a next call to mysql_parse().

The solution is to restore memroot right after the failed parsing.
2006-10-19 14:43:52 +04:00
pekka@orca.ndb.mysql.com
16ff0ddb4c Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux
2006-10-19 12:29:24 +02:00
jonas@perch.ndb.mysql.com
d82797ec8f Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-19 11:23:34 +02:00
jonas@perch.ndb.mysql.com
61d7b5ca42 ndb - add temporary tables to hugo
and use it for testOperations/testTransactions
2006-10-19 11:20:04 +02:00
jonas@perch.ndb.mysql.com
5f69741462 ndb - bug#22672
fix another incorrect assertion
2006-10-19 11:18:04 +02:00
jonas@perch.ndb.mysql.com
5feaf8cafd ndb - fix incorrect assertion
Dont assert when getting gci=0 in read only transaction
2006-10-19 10:43:25 +02:00
jonas@perch.ndb.mysql.com
e3d84b36db Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-10-19 10:29:52 +02:00
istruewing@chilla.local
d06526aaa4 Merge chilla.local:/home/mydev/mysql-5.0-merge
into  chilla.local:/home/mydev/mysql-5.1-merge
2006-10-19 10:29:38 +02:00
istruewing@chilla.local
5af9dfa6ba Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  chilla.local:/home/mydev/mysql-5.1-merge
2006-10-19 10:15:08 +02:00
istruewing@chilla.local
81625bff24 Merge chilla.local:/home/mydev/mysql-4.1-merge
into  chilla.local:/home/mydev/mysql-5.0-merge
2006-10-19 10:01:28 +02:00
istruewing@chilla.local
11d453cc33 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-merge
2006-10-19 09:59:01 +02:00
istruewing@chilla.local
73cdbb4e7a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1-merge
2006-10-19 09:44:51 +02:00
jonas@perch.ndb.mysql.com
470e4daa14 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-19 09:38:37 +02:00
jonas@perch.ndb.mysql.com
2b04fb22be ndb - bug#23200
this changes lock taken during peek, to decrease likelyhood of transaction abort
2006-10-19 09:27:58 +02:00
jonas@perch.ndb.mysql.com
deb9a3cc68 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-10-19 09:23:56 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1ddf03dab1 Makefile.am:
Quote variable in "for"-loop head, in case it can be empty.
2006-10-19 04:38:16 +02:00
igor@rurik.mysql.com
3a4a9521d8 Changed test case for bug 22342 to make it platform independent. 2006-10-18 17:24:33 -07:00
jonas@perch.ndb.mysql.com
0192b43927 ndb - bug#23430
make sure not to release log buffer twice (or several times) in case of abort of multi update
2006-10-18 20:54:25 +02:00
jonas@perch.ndb.mysql.com
bacb71d6c7 ndb - bug#23200
Make sure postExecute is not run for blobs if AO_IgnoreError
2006-10-18 16:48:44 +02:00
mskold/marty@mysql.com/linux.site
0522b11066 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-10-18 16:41:17 +02:00
mskold/marty@mysql.com/linux.site
9f686a4c99 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
2006-10-18 16:34:43 +02:00
holyfoot/hf@deer.(none)
33a0e82f6e Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/hf/work/mysql-5.1-release
2006-10-18 18:53:08 +05:00
holyfoot/hf@mysql.com/deer.(none)
fc35165805 letter's case fixed 2006-10-18 18:48:38 +05:00
mskold/marty@linux.site
f56e4579ab Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-10-18 15:17:47 +02:00
holyfoot/abotchkov@bk-internal.mysql.com
9c0b872662 Merge mysql.com:/data0/bk/mysql-5.0
into  mysql.com:/data0/bk/mysql-5.0-kt
2006-10-18 15:11:01 +02:00
svoj@mysql.com/april.(none)
a2e0059f3c BUG#23175 - MYISAM crash/repair failed during repair
Repair table could crash a server if there is not sufficient
memory (myisam_sort_buffer_size) to operate. Affects not only
repair, but also all statements that use create index by sort:
repair by sort, parallel repair, bulk insert.

Return an error if there is not sufficient memory to store at
least one key per BUFFPEK.

Also fixed memory leak if thr_find_all_keys returns an error.
2006-10-18 17:57:29 +05:00
stewart@willster.(none)
0783b57bc7 BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
update partition engine for handler::info returning int
2006-10-18 22:31:48 +10:00
mskold/marty@mysql.com/linux.site
b381ed95d9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-10-18 14:28:18 +02:00
stewart@willster.(none)
1d70db173f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
2006-10-18 22:23:14 +10:00
mskold/marty@linux.site
3d8a932029 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-10-18 14:06:32 +02:00
holyfoot/hf@mysql.com/deer.(none)
b8e31d05f1 bug #23369 (Embedded library can't be linked)
Problem is that some files moved to storage/*/ still are dependent
on sql/ code (usually use members of THD structure)
that can get different being compiled with another #define-s
Code added to recompile these for the embedded server
2006-10-18 17:03:37 +05:00
kroki/tomash@moonlight.intranet
9fd2c86103 Fix for valgrind warning introduced by the fix for bug#21354:
(COUNT(*) = 1) not working in SELECT inside prepared statement.
Note: the warning was introduced in 5.0 and 5.1, 4.1 is OK with the
original fix.

The problem was that in 5.0 and 5.1 clear() for group functions may
access hybrid_type member, and this member is initialized in
fix_fields().

So we should not call clear() from item cleanup() methods, as cleanup()
may be called for unfixed items.
2006-10-18 15:20:34 +04:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
87a9d23487 mysql.spec.sh:
Aligned test flags to TAR builds
2006-10-18 12:35:45 +02:00
stewart@willster.(none)
71636edc16 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
2006-10-18 18:51:39 +10:00
stewart@willster.(none)
467903724c Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug21253
2006-10-18 18:41:43 +10:00
stewart@willster.(none)
73831dad50 Bug #19148 Backup causes cluster down if _really_ early abort happens
Early abort, failing to allocate buffers, would go down the abort track and
 end up trying to sendDropTriggers (as the standard stop backup does). 
However, it is possible to not have any tables yet defined in the backup 
(due to allocating buffers is before this). Simple check in sendDropTrig 
(and continue to next step). Files may be open, so we continue to close them.

Also updated ERROR_Codes (and added one to test this bug).
2006-10-18 18:19:16 +10:00
jonas@perch.ndb.mysql.com
5bce99a90b ndb -
Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)
2006-10-18 10:07:02 +02:00