Commit graph

37362 commits

Author SHA1 Message Date
kostja@bodhi.local
7290fa2fb7 Post-merge fixes. 2006-08-30 23:09:47 +04:00
rburnett@bk-internal.mysql.com
f01c7cd66f Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-30 21:02:39 +02:00
evgen@moonbone.local
fe18e36e73 sql_base.cc, ndb_condition_pushdown.result, opt_range.cc:
After merge changes
2006-08-30 22:11:23 +04:00
Reggie@blackhole.
3d5fe499f0 disabled some tests to get passing tests 2006-08-30 11:16:53 -05:00
georg@lmy002.wdf.sap.corp
0948809a3c Fix for bug
CMake versions > 2.4 allow linking to STATIC or SHARED libraries only.
2006-08-30 12:17:35 +02:00
mskold/marty@mysql.com/linux.site
6bac3b8f40 NDBAPI cleanup 2006-08-30 11:41:21 +02:00
gluh@mysql.com/gluh.(none)
06d8fd7233 bug#21676 select * from information_schema.files crashes server
skip engine handling if engine is disabled
2006-08-30 13:42:31 +05:00
kostja@bodhi.local
ebb7070430 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-30 03:00:19 +04:00
jonas@perch.ndb.mysql.com
365b69dc7f Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 22:56:23 +02:00
kostja@bodhi.local
3bf609b7f2 A fix for Bug#14897 "ResultSet.getString("table.column") sometimes
doesn't find the column"

When a user was using 4.1 tables with VARCHAR column and 5.0 server
and a query that used a temporary table to resolve itself, the
table metadata for the varchar column sent to client was incorrect:
MYSQL_FIELD::table member was empty.

The bug was caused by implicit "upgrade" from old VARCHAR to new
VARCHAR hard-coded in Field::new_field, which did not preserve
the information about the original table. Thus, the field metadata
of the "upgraded" field pointed to an auxiliary temporary table
created for query execution.

The fix is to copy the pointer to the original table to the new field.
2006-08-30 00:38:58 +04:00
rburnett@bk-internal.mysql.com
3cb32f9c4f Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-29 21:16:59 +02:00
brian@zim.(none)
5c3ac45ca4 Re'ordering of startup. Fixed Execution path issues. Added function for de'initing everything. This includes Antony's suggestions (bk collapse uber alles!) 2006-08-29 11:58:12 -07:00
evgen@moonbone.local
8cf9781717 Merge moonbone.local:/work/tmp_merge-5.0-mysql
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-29 18:58:50 +04:00
timour/timka@lamia.home
0368914b9a Merge lamia.home:/home/timka/mysql/src/5.0-bug-21456
into  lamia.home:/home/timka/mysql/src/5.1-bug-21456
2006-08-29 16:39:09 +03:00
kroki/tomash@moonlight.intranet
cb4ea78cbd Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591
2006-08-29 16:24:00 +04:00
anozdrin/alik@alik.
1a7cb4153c Preliminary patch for the following bugs:
- BUG#15934: Instance manager fails to work;
  - BUG#18020: IM connect problem;
  - BUG#18027: IM: Server_ID differs;
  - BUG#18033: IM: Server_ID not reported;
  - BUG#21331: Instance Manager: Connect problems in tests;

The only test suite has been changed
(server codebase has not been modified).
2006-08-29 15:46:40 +04:00
kroki/tomash@moonlight.intranet
b9fef61616 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591
2006-08-29 14:37:52 +04:00
kroki/tomash@moonlight.intranet
f8f1dd3e87 BUG#17591: Updatable view not possible with trigger or stored function
When a view was used inside a trigger or a function, lock type for
tables used in a view was always set to READ (thus making the view
non-updatable), even if we were trying to update the view.

The solution is to set lock type properly.
2006-08-29 14:32:59 +04:00
jonas@perch.ndb.mysql.com
7357e431a3 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 10:49:05 +02:00
jonas@perch.ndb.mysql.com
3cb9b16e0d ndb -
Add order by in rpl_(ndb)_multi_update3 to make result deterministic
2006-08-29 10:47:28 +02:00
jonas@perch.ndb.mysql.com
853cf3dac4 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 09:20:09 +02:00
jonas@perch.ndb.mysql.com
b6e908ca29 ndb -
fix backup/lcp race
2006-08-29 09:19:41 +02:00
rburnett@bk-internal.mysql.com
6034cc2231 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-28 17:55:27 +02:00
jonas@perch.ndb.mysql.com
6011ad7868 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-28 16:03:51 +02:00
jonas@perch.ndb.mysql.com
8fb56fbc3a ndb -
Snapup testBackup XXXerror
2006-08-28 15:55:30 +02:00
jonas@perch.ndb.mysql.com
802990e139 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-08-28 10:27:02 +02:00
jonas@perch.ndb.mysql.com
67a5d98c1d ndb - bug#21615
Improve error message when detecting corrupted REDO log
2006-08-28 10:26:21 +02:00
jonas@perch.ndb.mysql.com
b3ee645364 ndb - autotest
adopt to new error code 755 (invalid tablespace)
2006-08-28 08:32:14 +02:00
evgen@moonbone.local
002af6b5ea Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-27 00:49:25 +04:00
evgen@moonbone.local
7a55f7fac4 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
into  moonbone.local:/work/tmp_merge-5.0-mysql
2006-08-27 00:32:14 +04:00
evgen@moonbone.local
13f50fdb69 Merge moonbone.local:/work/tmp_merge-4.1-mysql
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-26 23:11:34 +04:00
evgen@moonbone.local
bafd6d5065 Merge moonbone.local:/work/tmp_merge-5.0-opt-mysql
into  moonbone.local:/work/tmp_merge-5.0-mysql
2006-08-26 22:17:34 +04:00
mikael/pappa@dator5.(none)
cb77c9b721 Enabled partition test again 2006-08-26 10:40:58 -04:00
mikael/pappa@dator5.(none)
b28a550eb4 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
into  dator5.(none):/home/pappa/bug21388
2006-08-26 06:14:05 -04:00
brian@zim.(none)
7216b5bc7a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into  zim.(none):/home/brian/mysql/arch-5.1
2006-08-25 14:07:30 -07:00
brian@zim.(none)
e831273902 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into  zim.(none):/home/brian/mysql/arch-5.1
2006-08-25 13:32:06 -07:00
brian@zim.(none)
baa914e66d Cleanup of unused variables.
Fixed "discover" in the handler API.

Fixed problem where handlerton was not zero'ed. I need to look around, I suspect this problem is more widespread.
2006-08-25 13:31:15 -07:00
andrey@example.com
3cbb16587f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  example.com:/work/mysql-5.0-runtime
2006-08-25 20:04:19 +02:00
jonas@perch.ndb.mysql.com
97a956ca73 ndb - fix some bug in testSRBank 2006-08-25 16:47:31 +02:00
andrey@example.com
f115ecf89f Fix for bug#21795: SP: sp_head::is_not_allowed_in_function() contains
erroneous check

Problem: Actually there were two problems in the server code. The check
for SQLCOM_FLUSH in SF/Triggers were not according to the existing
architecture which uses sp_get_flags_for_command() from sp_head.cc .
This function was also missing a check for SQLCOM_FLUSH which has a
problem combined with prelocking. This changeset fixes both of these
deficiencies as well as the erroneous check in
sp_head::is_not_allowed_in_function() which was a copy&paste error.
2006-08-25 15:51:29 +02:00
sergefp@mysql.com
46480b22d2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/psergey/mysql-5.0-bug16255-merge
2006-08-25 14:44:28 +04:00
jonas@perch.ndb.mysql.com
e4c3a58134 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-25 11:59:28 +02:00
anozdrin/alik@alik.
7121f5b351 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  alik.:/mnt/raid/alik/MySQL/devel/5.0-rt-bug16899
2006-08-25 13:37:07 +04:00
igor@rurik.mysql.com
d10d5b835d Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-08-25 02:18:30 -07:00
igor@rurik.mysql.com
218a96d2c6 Fixed bug : wrong estimate of rows after elimination of
const tables. This resulted in choosing extremely inefficient
execution plans in same cases when distribution of data in
joined were skewed (see the customer test case for the bug).
2006-08-25 02:17:41 -07:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
aeea252b4d no longer need ifdef as plugin is conditionally compiled 2006-08-25 00:37:01 -07:00
kroki/tomash@moonlight.intranet
e48e2e4613 Comment cleanup after push of bug#21166. 2006-08-25 11:34:13 +04:00
jonas@perch.ndb.mysql.com
c6e8be9808 ndb - bug#21806
disable ndb_autodiscover3 (cluster restart (--initial))
2006-08-25 08:57:38 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
b68f0437e7 fix for windows build 2006-08-24 22:10:55 -07:00
rburnett@bk-internal.mysql.com
31867f23a8 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-08-25 03:32:03 +02:00