Commit graph

12456 commits

Author SHA1 Message Date
jimw@mysql.com
f006319405 Merge mysql.com:/home/jimw/my/mysql-4.1-11707
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-25 09:36:51 -07:00
bell@sanja.is.com.ua
97ad1cba62 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-08-25 19:14:43 +03:00
bell@sanja.is.com.ua
5963573c05 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-08-25 17:47:18 +03:00
petr@mysql.com
05fe0b2247 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
2005-08-25 18:16:21 +04:00
sergefp@mysql.com
469e413f94 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
2005-08-25 18:16:20 +04:00
petr@mysql.com
56882c61bb Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
2005-08-25 18:05:49 +04:00
heikki@hundin.mysql.fi
7ec0b37c3c ha_innodb.cc:
Fix typo
2005-08-25 16:57:13 +03:00
sergefp@mysql.com
c78ce16681 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
2005-08-25 17:39:02 +04:00
sergefp@mysql.com
95c3afc5d9 Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.
"Interleaved SPs execution is now binlogged properly, "SELECT spfunc()" is binlogged too.
The known remaining issue is binlogging/replication of "a routine is deleted while it is executed" scenario.
2005-08-25 17:34:34 +04:00
petr@mysql.com
db5acc18ed Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
2005-08-25 16:06:49 +04:00
petr@mysql.com
8dfa469729 Fix Bug#11333 "Stored Procedure: Memory blow up on repeated SELECT ... INTO query" 2005-08-25 15:34:14 +04:00
osku@127.(none)
ce22788bdd Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-25 14:15:31 +03:00
joerg@mysql.com
fea0745ba8 Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/push-5.0 2005-08-25 11:46:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
monty@mishka.mysql.com
848c936693 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.mysql.com:/home/my/mysql-5.0
2005-08-25 10:44:08 +03:00
andrey@lmy004.
d4a25c1b36 Merge lmy004.:/work/mysql-5.0-clean
into lmy004.:/work/mysql-5.0-bug12533-2
2005-08-25 09:38:59 +02:00
andrey@lmy004.
dde57f082b fix for bug #12533 (crash on DESCRIBE <view> after renaming base table column) 2005-08-25 09:24:21 +02:00
monty@mishka.local
b90d7fe3b6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-08-25 09:40:40 +03:00
monty@mishka.local
f16c7b3c5c After merge fixes 2005-08-25 09:38:06 +03:00
georg@lmy002.wdf.sap.corp
adc603a930 Merge lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0_5501
2005-08-25 07:02:37 +02:00
monty@mishka.local
f384e08277 Merge mishka.local:/home/my/mysql-4.1
into  mishka.local:/home/my/mysql-5.0
2005-08-25 06:55:48 +03:00
jimw@mysql.com
27b6d59db2 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-24 17:09:44 -07:00
kent@mysql.com
96dc373650 ha_tina.cc:
Some lack madvice()
2005-08-25 01:02:40 +02:00
jimw@mysql.com
6964b7491e Merge mysql.com:/home/jimw/my/mysql-5.0-11680
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-24 15:54:23 -07:00
jimw@mysql.com
56dfc1bf18 Merge mysql.com:/home/jimw/my/mysql-5.0-12562
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-24 15:52:58 -07:00
jimw@mysql.com
9e4a9e23c6 Make SYSDATE() behave as in Oracle: always the current datetime, not the
datetime of when the current statement began. This also makes SYSDATE()
not safe in replication. (Bug #12562)
2005-08-24 15:50:58 -07:00
monty@mishka.local
05ee47a80d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-08-25 00:22:59 +03:00
monty@mishka.local
bb7289b7d2 Cleanups during review of new code
Removed ASSERT that can obviously never be wrong
2005-08-25 00:21:47 +03:00
serg@sergbook.mysql.com
714b27c71c merged 2005-08-25 00:08:02 +04:00
dlenev@mysql.com
dc1df41b3f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0.12
2005-08-24 23:54:53 +04:00
dlenev@mysql.com
2a880905c4 Correction of fix for bug #12280 "Triggers: crash if flush tables".
We should not assume that "thd" argument of reload_acl_and_cache() is
non-zero. Failure to do so will cause server to crash when one sends
SIGHUP to it.
2005-08-24 23:44:42 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0 Several fixes for Netware. 2005-08-24 22:03:34 +03:00
monty@mishka.local
17654cd7af Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mishka.local:/home/my/mysql-4.1
2005-08-24 20:55:54 +03:00
monty@mishka.local
842de6ea45 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mishka.local:/home/my/mysql-4.1
2005-08-24 19:53:40 +03:00
monty@mishka.local
8e6aa0e7ea Review fixes 2005-08-24 19:37:27 +03:00
jimw@mysql.com
006e5b770b Merge mysql.com:/home/jimw/my/mysql-4.1-12302
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-24 08:50:12 -07:00
igor@rurik.mysql.com
b610c0972f Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-24 08:19:02 -07:00
heikki@hundin.mysql.fi
2310ef6938 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into  hundin.mysql.fi:/home/heikki/mysql-4.1
2005-08-24 17:30:25 +03:00
heikki@hundin.mysql.fi
9f72d504b4 ha_innodb.cc:
Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain
2005-08-24 17:27:46 +03:00
georg@lmy002.wdf.sap.corp
254db48603 Fix for bug#5501 (SHOW TABLE STATUS should show "view" in upper case) 2005-08-24 12:51:00 +02:00
lars@mysql.com
f34398ba65 BUG#12532: Fix for the case when my_malloc is macro 2005-08-24 11:14:41 +02:00
msvensson@neptunus.(none)
9af0f156a5 Improve default error message for optimize/repair table 2005-08-24 10:41:44 +02:00
timour@mysql.com
5d736f1063 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-24 10:52:30 +03:00
timour@mysql.com
04a6a8e011 Post-fix for BUG#6276. 2005-08-24 10:51:28 +03:00
osku@127.(none)
55c752fb37 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-24 09:25:32 +03:00
igor@rurik.mysql.com
4adc90bdd6 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-23 23:22:52 -07:00
petr@mysql.com
adb8244163 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usersnfs/pchardin/mysql-5.0-virgin
2005-08-24 02:50:23 +02:00
petr@mysql.com
659809d30f fix compilation failure appeared after monty's cleanup 2005-08-24 02:46:13 +02:00
lars@mysql.com
f98f46c471 BUG#12532: Fixes after review 2005-08-24 01:45:15 +02:00
lars@mysql.com
d8df765913 Merge mysql.com:/users/lthalmann/ltx/root/mysql-5.0
into  mysql.com:/users/lthalmann/ltx/dev/mysql-5.0-bug12532
2005-08-24 00:16:58 +02:00
bell@sanja.is.com.ua
144c847da6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-08-23 23:17:36 +03:00
jimw@mysql.com
cf5dd176c0 Fix build using --without-server. (Bug #11680) 2005-08-23 11:25:24 -07:00
timour@mysql.com
9a6aefab3a Fix for BUG#6276. 2005-08-23 20:03:32 +03:00
kent@mysql.com
4d2cc6e503 Merge 2005-08-23 18:06:24 +02:00
timour@mysql.com
bf8563ae1d Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-23 18:15:51 +03:00
timour@mysql.com
e040300393 WL#2486 - natural and using join according to SQL:2003
* Provide backwards compatibility extension to name resolution of
  coalesced columns. The patch allows such columns to be qualified
  with a table (and db) name, as it is in 4.1.
  Based on a patch from Monty.

* Adjusted tests accordingly to test both backwards compatible name
  resolution of qualified columns, and ANSI-style resolution of
  non-qualified columns.
  For this, each affected test has two versions - one with qualified
  columns, and one without.
2005-08-23 18:08:04 +03:00
serg@sergbook.mysql.com
1fbb96ea97 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-08-23 14:16:17 +04:00
dlenev@mysql.com
603dddfdb4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg11896
2005-08-23 09:15:05 +04:00
jimw@mysql.com
447988759f Reorder server startup so that network startup is done after storage
engine startup. (Bug #11707)
2005-08-22 18:07:42 -07:00
igor@rurik.mysql.com
21b63441f5 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-22 17:46:21 -07:00
igor@rurik.mysql.com
94166de5f3 sql_show.cc:
Database name was set incorrectly for any show command
  that used sunqueries in its where condition.
information_schema.test, information_schema.result:
  Added a test case for bug #12636.
2005-08-22 17:32:02 -07:00
jimw@mysql.com
f70beef6c7 Use the hostname with which the user authenticated when determining which
user to update with 'SET PASSWORD = ...'. (Bug #12302)
2005-08-22 15:48:50 -07:00
jimw@mysql.com
247e9421fa Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-22 11:54:33 -07:00
jimw@mysql.com
bb4af4f176 Merge mysql.com:/home/jimw/my/mysql-5.0-12689
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-22 10:19:09 -07:00
monty@mishka.local
ef06534945 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-08-22 19:58:11 +03:00
konstantin@mysql.com
fb7be5270f Add a comment about I_List<> copy constructor. 2005-08-22 19:23:01 +04:00
monty@mishka.local
49413542bd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-08-22 16:06:00 +03:00
evgen@moonbone.local
3831bb56df Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/11718-bug-4.1-mysql
2005-08-22 15:46:14 +04:00
evgen@moonbone.local
f5f6ed8b78 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/11398-bug-5.0-mysql
2005-08-22 15:46:09 +04:00
osku@127.(none)
216227d8a2 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-22 12:53:54 +03:00
serg@sergbook.mysql.com
eadb86d56f after pull cleanup 2005-08-22 13:20:02 +04:00
monty@mishka.local
d62295e44e Cleanup during review of new pushed code 2005-08-22 01:13:37 +03:00
jonas@eel.(none)
a58c0e7dae Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-21 16:35:27 +02:00
jonas@eel.(none)
5823c91f88 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-21 16:22:08 +02:00
monty@mishka.local
ba2ace25a9 Merge mishka.local:/tmp/skr99/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-08-21 13:05:15 +03:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
dce31760e4 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-08-20 21:21:49 -04:00
sasha@asksasha.com
e038bfe8ff Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
2005-08-20 16:09:59 -06:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
4084c13605 Merge c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-08-20 16:38:55 -04:00
serg@sergbook.mysql.com
573a7f5cc1 be standard (I_S.TABLES: s/TEMPORARY/LOCAL &/) 2005-08-20 20:15:30 +04:00
serg@sergbook.mysql.com
117d61c8a0 Merge bk-internal:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-08-20 14:38:18 +04:00
monty@mishka.local
1c1f26d5e2 Fixes during review of new pushed code
Fixed new bug when running a SP without a default database
2005-08-20 11:00:00 +03:00
jimw@mysql.com
6240210305 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-19 17:53:48 -07:00
jimw@mysql.com
a3c893e0b8 Fix cases where SLEEP() calls would get optimized away or cached. (Bug #12689) 2005-08-19 15:51:40 -07:00
igor@rurik.mysql.com
2c2f18b98b Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-19 15:07:51 -07:00
patg@radha.local
7a43a0f54d Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean
2005-08-19 23:44:40 +02:00
elliot@mysql.com
55b81af671 Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
into  mysql.com:/home/emurphy/src/work/mysql-5.0
2005-08-19 15:29:30 -04:00
igor@rurik.mysql.com
55fd68ccd7 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-19 12:10:34 -07:00
elliot@mysql.com
d9efe655ed Bug#11338 Fixes from review (identical functionality). 2005-08-19 14:49:34 -04:00
jimw@mysql.com
dd1e0fb8c7 Merge mysql.com:/home/jimw/my/mysql-5.0-11711
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-19 11:40:39 -07:00
lars@mysql.com
c79ba8e346 BUG#12532: Added more memory in malloc for slave query cache 2005-08-19 16:25:55 +02:00
serg@sergbook.mysql.com
c234386a40 the syntax is XA END xid [SUSPEND [FOR MIGRATE]] 2005-08-19 18:00:16 +04:00
timour@mysql.com
a53d283481 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-19 16:05:58 +03:00
konstantin@mysql.com
887fba4736 A fix and a test case for "Bug #12168 'DECLARE CONTINUE HANDLER FOR
NOT FOUND ...' in conditional handled incorrectly".

Whenever we remove an instruction during optimization, we need to
adjust instruction numbers (ip - instruction pointer) stored in all
instructions. In addition to that, sp_instr_hpush_jump, which 
corresponds to DECLARE CONTINUE HANDLER needs adjustment for m_handler,
which holds the number of instruction with the continue handler.
In the bug report, a wrong ip stored in m_handler was pointing at 
FETCH, which resulted in an error message and abnormal SP termination.
The fix is to just remove m_handler member from sp_instr_hpush_jump,
as it's always points to the instruction next to the DECLARE
statement itself (m_ip+1).
2005-08-19 17:03:21 +04:00
timour@mysql.com
d053a23034 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-19 15:32:00 +03:00
timour@mysql.com
f5fc1543aa WL#2486 - natural and using join according to SQL:2003
- Corrected problem with N-way nested natural joins in PS mode.
- Code cleanup
- More asserts to check consistency of name resolution contexts
- Fixed potential memory leak of name resolution contexts
2005-08-19 15:22:30 +03:00
jonas@eel.(none)
4575678ff1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-19 13:40:40 +02:00
igor@rurik.mysql.com
2d32b77693 distinct.test, distinct.result:
Added test cases for bug #12625.
sql_select.cc:
  Fixed bug #12625.
  Fixed invalid removal of constant items from the DISTINCT
  list in the function create_distinct_group.
2005-08-19 01:57:22 -07:00
jonas@eel.(none)
c962896744 Merge eel.(none):/home/jonas/src/mysql-5.0-push
into  eel.(none):/home/jonas/tmp/kkk/mysql-5.0
2005-08-19 10:50:51 +02:00
osku@127.(none)
70be812365 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-19 11:34:04 +03:00
bell@sanja.is.com.ua
376c5307df Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
2005-08-19 10:40:46 +03:00
andrey@lmy004.
a5ecf5f4b1 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy004.:/work/mysql-5.0-clean
2005-08-19 09:14:59 +02:00
jonas@eel.(none)
178a76fab4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-19 07:58:54 +02:00
bell@sanja.is.com.ua
a3724d2546 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
2005-08-19 08:55:38 +03:00
jonas@eel.(none)
1b1d1d8d5c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-19 07:52:42 +02:00
patg@radha.local
d0767dfad3 BUG #12498 Fixed mispelling 2005-08-19 07:51:22 +02:00
sasha@asksasha.com
c594ab7921 updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication).
We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's 
suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and 
logging now is done in batches - new batch is started if the buffer becomes full.
Reduced memory usage by reusing the table list instead of accumulating a list of 
dropped table names. Also fixed the problem if the table was not actually dropped, eg
due to permissions. Extended the test case to make sure batched query 
logging does work.
2005-08-18 21:40:14 -06:00
igor@rurik.mysql.com
743917759c Manual merge 2005-08-18 15:17:04 -07:00
andrey@lmy004.
0e6606c8da Merge lmy004.:/work/mysql-5.0-clean
into lmy004.:/work/mysql-5.0-bug12591
2005-08-18 23:40:04 +02:00
evgen@moonbone.local
1fc33b0533 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/10624-bug-5.0-mysql
2005-08-18 22:46:17 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
c6ee26ab45 Some minor fixes for Netware. These were required after we started building
against a later version of libc.
2005-08-18 21:26:25 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3bfa514655 Changes for Netware. This is needed when building against newer Libc
than we've used before.
2005-08-18 21:22:35 +03:00
kent@mysql.com
7933906325 mysqld.dsp:
Added archive and example storage engine to Windows build
ha_example.cc, ha_archive.cc:
  Windows fix, use relative include path to "mysql_priv.h"
ha_archive.h:
  Windows VC6 compile needed (char*) cast of byte var
mysqltest.dsp, mysql_test_run_new.dsp:
  Added /FD flag, to avoid include file warnings
2005-08-18 17:29:24 +02:00
dlenev@mysql.com
6c39364f85 Fix for bug #11896 "Partial locking in case of recursive trigger definitions".
If we are in stored function or trigger we should ensure that we won't change
table that is already used by calling statement (this can damage table or
easily cause infinite loops). Particularly this means that recursive triggers
should be disallowed.
2005-08-18 19:07:23 +04:00
jimw@mysql.com
6c3dafd07c Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-18 07:59:43 -07:00
igor@rurik.mysql.com
c93d841dbf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-18 07:30:45 -07:00
sergefp@mysql.com
c085c9a3b7 Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988, 2005-08-16 00:03:50+04:00, aivanov@mysql.com
)
2005-08-18 18:26:30 +04:00
igor@rurik.mysql.com
b5e7bfa9f2 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-18 05:36:22 -07:00
jonas@eel.(none)
7c70be87b7 Merge eel.(none):/home/jonas/src/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-18 14:28:13 +02:00
jonas@eel.(none)
6399a93ac2 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-5.0
2005-08-18 14:25:00 +02:00
jonas@eel.(none)
96f719818c Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-18 14:07:31 +02:00
jonas@eel.(none)
3b68047235 bug#12118 - ndb alter table data loss
Split table version into 2 (major, minor)
  Impl. signaling to API when table has been altered
  Allow running transactions to use any minor number for transactions
2005-08-18 14:02:25 +02:00
petr@mysql.com
cb71626268 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usersnfs/pchardin/mysql-5.0
2005-08-18 11:25:32 +02:00
petr@mysql.com
4fb6f4dddf Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory
and Bug#12297 SP crashes the server if data inserted inside a lon loop
Third commit attempt. With fixes to the issues, showed up after full rebuild and
tests on other hosts.
2005-08-18 11:23:54 +02:00
bell@sanja.is.com.ua
fc070c2bcb stop on NULL comparison only if it is allowed (BUG#12509) 2005-08-18 12:07:14 +03:00
timour@mysql.com
76cacf4522 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-18 11:29:29 +03:00
timour@mysql.com
f31f5eabc7 WL#2486 - natural and using join
Fixed debug printout.
2005-08-18 11:28:50 +03:00
timour@mysql.com
8d975efc72 WL#2486 - natural and using join according to SQL:2003
- Fixed minor error after Monty's review.
2005-08-18 11:24:59 +03:00
igor@rurik.mysql.com
fd5461ac12 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-17 22:24:20 -07:00
igor@rurik.mysql.com
5ac7d86793 view.test:
Added a test case for bug #10970.
view.result:
  Added a test case for bug #10970.
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE.
sql_view.cc:
  Fixed bug #10970.
  In the function mysql_create_view if a view does not refer
  any tables directly the variable table must be updated
  after the call of open_and_lock_tables.
errmsg.txt:
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE
  (when fixing bug #10970).
2005-08-17 22:19:12 -07:00
jimw@mysql.com
1eb0f45d17 Fix minor typo in handling of error conditions and return of SLEEP(). 2005-08-17 19:57:07 -07:00
jimw@mysql.com
15f97778ff Revert patch for Bug #12595, it causes the sql_mode test to fail. 2005-08-17 19:56:14 -07:00
jimw@mysql.com
e7656ffecc Merge mysql.com:/home/jimw/my/mysql-5.0-12582
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-17 18:45:36 -07:00
jimw@mysql.com
19ed563cd5 Fix bad merge of sql/item_strfunc.cc by aivanov 2005-08-17 18:42:07 -07:00
monty@mysql.com
c726451abb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-08-18 03:41:11 +03:00
monty@mysql.com
3eaa953529 Cleanups and optimization during review of new code 2005-08-18 03:12:42 +03:00
evgen@moonbone.local
6d8bd17c3a Fix bug #11718 query with function, join and order by returns wrong type.
create_tmp_field_from_item() was creating tmp field without regard to
original field type of Item. This results in wrong type being reported to
client.

To create_tmp_field_from_item() added special handling for Items with 
DATE/TIME field types to preserve their type.
2005-08-17 23:53:12 +04:00
bell@sanja.is.com.ua
7f48830f9e sql_view.cc:
correct exit from mysql_create_view to restore ennvironment (BUG#12468)
view.result, view.test:
  test of CRETE VIEW in SP
2005-08-17 22:42:53 +03:00
sasha@asksasha.com
76a59be6fb Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
2005-08-17 12:39:30 -06:00
andrey@lmy004.
4ff51a5743 fix for bug #12591 (SHOW TABLES FROM dbname produces wrong error message) 2005-08-17 17:51:10 +02:00
aivanov@mysql.com
c3de1aa84a Merge mysql.com:/home/alexi/mysql-5.0
into  mysql.com:/home/alexi/dev/mysql-5.0-1
2005-08-17 18:46:20 +04:00
aivanov@mysql.com
8a80193e0a Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/mysql-5.0
2005-08-17 18:41:19 +04:00
timour@mysql.com
a55786ca70 WL#2486 - natural and using join according to SQL:2003
- fixed a problem with RIGHT JOIN ON and enabled corresponding tests in select.test
- fixed a memory leak
2005-08-17 17:19:31 +03:00
timour@mysql.com
0671228b05 Fixed code formatting. 2005-08-17 14:20:01 +03:00
timour@mysql.com
066e3c4209 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-17 13:47:16 +03:00
timour@mysql.com
c8e55a35b3 WL#2486 - Process NATURAL and USING joins according to SQL:2003
- Applied Monty's patch after his review of sql_base.cc
2005-08-17 13:46:36 +03:00
elliot@mysql.com
1664e31f12 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338
2005-08-17 04:32:29 -04:00
elliot@mysql.com
197782605f BUG#11338 (logging of prepared statement w/ blob type)
In cp932, '\' character can be the second byte in a 
multi-byte character stream. This makes it difficult to use
mysql_escape_string. Added flag to indicate which languages allow
'\' as second byte of multibyte sequence so that when putting a prepared
statement into the binlog we can decide at runtime whether hex encoding
is really needed.
2005-08-17 04:26:32 -04:00
osku@127.(none)
3809fdac6d Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-17 11:11:50 +03:00
osku@127.(none)
fb48039444 Fix bug #11946, truncate not always resetting the auto-increment counter
in InnoDB tables.
2005-08-17 11:00:20 +03:00
jimw@mysql.com
054e78943e Fix SLEEP() to be interruptable. (Bug #12582) 2005-08-16 16:31:16 -07:00
aivanov@mysql.com
df00bbc862 Merge mysql.com:/home/alexi/mysql-5.0
into  mysql.com:/home/alexi/dev/mysql-5.0-1
2005-08-16 23:33:06 +04:00
aivanov@mysql.com
0a1fa93190 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/mysql-5.0
2005-08-16 23:27:00 +04:00
aivanov@mysql.com
ed6cd805dc information_schema.test:
Added a comment line for a test case used for bug #12301.
information_schema.result:
  Fixed some test cases results (bug #12301).
sql_show.cc:
  Fixed bug #12301.
  The bug was due to a missing value setting for the NUMERIC_SCALE column
   in the get_schema_column_record() function (sql_show.cc).
2005-08-16 23:11:04 +04:00
andrey@lmy004.
41c93e368b Merge lmy004.:/work/mysql-5.0-clean
into lmy004.:/work/mysql-5.0-bug12595
2005-08-16 20:59:18 +02:00
andrey@lmy004.
7269045b82 after review fix for bug #12595 2005-08-16 20:54:53 +02:00
evgen@moonbone.local
eb6135a765 Fix bug #11398 Bug in field_conv() results in wrong result of join with index
When copying varchar fields with field_conv() it's not taken into account
that length_bytes of source and destination fields may be different.
This results in saving wrong data in field and making wrong key later.

Added check so if fields are varchar and have different length_bytes they
are not copied by memcpy().
2005-08-16 22:13:43 +04:00
andrey@lmy004.
a7a762e27d fix for bug #12595 (Escape character has to be exactly one) 2005-08-16 15:39:40 +02:00
jani@ua141d10.elisa.omakaista.fi
c7bdc5bb12 Fixed indentations in error and warning messages. 2005-08-16 15:32:41 +03:00
aivanov@mysql.com
246c0e687c Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/mysql-5.0
2005-08-16 15:35:39 +04:00
andrey@lmy004.wdf.sap.corp
c896ca1a10 fix for bug #12183 "SHOW OPEN TABLES behavior doesn't match grammar"
(after review commit)
2005-08-16 11:18:35 +02:00
igor@rurik.mysql.com
9693dc6a6b sql_select.cc:
Fixed bug #11479.
  The JOIN::reinit method cannot call setup_tables
  after the optimization phase since this function
  removes some optimization settings for joined
  tables. E.g. it resets values of the null_row flag to 0.
subselect.result, subselect.test:
  Added a test case for bug #11479.
2005-08-15 21:33:58 -07:00
jimw@mysql.com
68d5420d7c Clean up merge from 4.1 2005-08-15 14:19:56 -07:00
aivanov@mysql.com
405f03f389 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/mysql-5.0
2005-08-16 00:03:50 +04:00
jimw@mysql.com
2d34276417 Merge mysql.com:/home/jimw/my/mysql-5.0-12318
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-15 12:39:36 -07:00
jimw@mysql.com
55eebfb776 Merge mysql.com:/home/jimw/my/mysql-5.0-10627
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-15 12:38:56 -07:00
jimw@mysql.com
a3eaf4eec2 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-15 12:37:45 -07:00
evgen@moonbone.local
69319f17e7 Fix bug #10624 Views with multiple UNION and UNION ALL produce incorrect
results.

st_select_lex_unit::print() was losing UNION ALL if in statement were present
UNION DISTINCT.
2005-08-15 23:05:05 +04:00
monty@mysql.com
8589f14d45 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-08-15 20:12:28 +03:00
monty@mysql.com
c10f05552f Don't clear warnings for functions or triggers
Fixed failing test
2005-08-15 20:08:58 +03:00
jimw@mysql.com
df25928983 Merge mysql.com:/home/jimw/my/mysql-4.1-11796
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-15 09:59:11 -07:00
jimw@mysql.com
e21a025c65 Merge mysql.com:/home/jimw/my/mysql-4.1-12327
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-15 09:58:05 -07:00
acurtis@xiphis.org
c414bb1520 Bug#12518
"COLUMN_DEFAULT has wrong value if NOT NULL is set"
  Show NULL instead of empty string when no default value is set
2005-08-15 17:14:55 +01:00
lars@mysql.com
b6a65715d6 BUG#12542: Prevous patch was incorrect. This removed the patch. 2005-08-15 17:53:38 +02:00
monty@mysql.com
1a6f16edd9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-08-15 18:35:48 +03:00
monty@mysql.com
df32f7d621 Save and clear run context before executing a stored function or trigger and restore it afterwards.
This allows us to use statement replication with functions and triggers
The following things are fixed with this patch:
- NOW() and automatic timestamps takes the value from the main event for functions and triggers (which allows these to replicate with statement level logging)
- No side effects for triggers or functions with auto-increment values(), last_insert_id(), rand() or found_rows()
- Triggers can't return result sets

Fixes bugs:
#12480: NOW() is not constant in a trigger
#12481: Using NOW() in a stored function breaks statement based replication
#12482: Triggers has side effects with auto_increment values
#11587: trigger causes lost connection error
2005-08-15 18:15:12 +03:00
serg@sergbook.mysql.com
fb19be7d6d Merge bk-internal:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-08-15 12:07:36 +02:00
evgen@moonbone.local
6bb2d4d7a9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/mysql-5.0-bug-11864
2005-08-15 14:01:42 +04:00
evgen@moonbone.local
85afb22ef1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/mysql-5.0-bug-10802
2005-08-15 13:34:47 +04:00
evgen@moonbone.local
5dc75a559d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/mysql-5.0-bug-11864
2005-08-15 13:21:55 +04:00
evgen@moonbone.local
7fcb9cd599 Fix bug #10802 Index is not used if table using BDB engine on HP-UX
HP-UX compiler was generating code which makes wrong conversion from double to
ulonglong which results in not using index in some cases.

Changed type cast operators odrer with which generated code makes proper 
conversion.
2005-08-15 13:02:29 +04:00
serg@sergbook.mysql.com
d689d415b3 forgotten 'return' 2005-08-14 23:20:06 +02:00
sanja@hasky.mysql.fi
562786bc36 table.cc:
remove unneeded multitable_view assignment
sql_view.cc:
  fix potential memorry overrun in ref_array
  asssign multitable_view in time of view creation (BUG#12569)
2005-08-13 17:06:30 +03:00
sanja@hasky.mysql.fi
1006063ef1 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hasky.mysql.fi:/home/sanja/work-merge-5.0
2005-08-13 11:16:26 +03:00
sanja@hasky.mysql.fi
2e2b897ff3 item_subselect.cc:
postmerge fix
subselect.result:
  new 5.0 result (postmerge)
2005-08-13 11:15:17 +03:00
sanja@hasky.mysql.fi
16d279bb12 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  hasky.mysql.fi:/home/sanja/work-merge-5.0
2005-08-13 08:19:34 +03:00
bell@50.0.168.192.in-addr.arpa
8d7a364074 Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
2005-08-13 07:49:22 +03:00
bell@50.0.168.192.in-addr.arpa
c96bedb745 Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
2005-08-13 07:46:06 +03:00
bell@50.0.168.192.in-addr.arpa
1e248ceaf1 fixed convertion and handling IN subqueries with rows (BUG#11867) 2005-08-13 07:45:14 +03:00
tsmith@.mysql.com
9097bd2f08 sql_parse.cc:
Don't skip SET command even if --replicate-wild* says to.
  E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)
2005-08-13 05:08:29 +02:00
serg@sergbook.mysql.com
d42f973b80 merged 2005-08-12 22:58:13 +02:00
serg@sergbook.mysql.com
f5ff607c14 BUG#12162 - one can start two transactions with the same XID.
Now we keep all active XID's in a hash
2005-08-12 21:15:01 +02:00
evgen@moonbone.local
0f9b982970 Fix bug #12298 Typo in timestampdiff() function name results in erroneous
view being created.

Item_func_timestamp_diff::func_name() were returning function name as
"timestamp_diff" thus when view was executed function parameters wasn't 
properly recognized and error was raised.
2005-08-12 22:42:50 +04:00
timour@mysql.com
354ce1d024 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-2486-merge
2005-08-12 19:27:54 +03:00
timour@mysql.com
a247282aa6 Implementation of WL#2486 -
"Process NATURAL and USING joins according to SQL:2003".

* Some of the main problems fixed by the patch:
  - in "select *" queries the * expanded correctly according to
    ANSI for arbitrary natural/using joins
  - natural/using joins are correctly transformed into JOIN ... ON
    for any number/nesting of the joins.
  - column references are correctly resolved against natural joins
    of any nesting and combined with arbitrary other joins.

* This patch also contains a fix for name resolution of items
  inside the ON condition of JOIN ... ON - in this case items must
  be resolved only against the JOIN operands. To support such
  'local' name resolution, the patch introduces a stack of
  name resolution contexts used at parse time.

NOTICE:
- This patch is not complete in the sense that
  - there are 2 test cases that still do not pass -
    one in join.test, one in select.test. Both are marked
    with a comment "TODO: WL#2486".
  - it does not include a new test specific for the task
2005-08-12 17:57:19 +03:00
osku@127.(none)
11fb9678a9 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-12 16:21:13 +03:00
bar@mysql.com
4a071b4833 item_strfunc.cc:
After merge change.
  4.1 method was replaced in 5.0.
2005-08-12 18:13:42 +05:00
bar@mysql.com
1b50f35ab2 Merge mysql.com:/usr/home/bar/mysql-4.1.b12351
into  mysql.com:/usr/home/bar/mysql-5.0
2005-08-12 17:10:00 +05:00
monty@mysql.com
4963388cc1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-08-12 13:57:20 +03:00
monty@mysql.com
4c0d23e156 Fixes during review of new pushed code
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
2005-08-12 13:54:42 +03:00
bar@mysql.com
fd7ad7f16f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12351
2005-08-12 15:44:03 +05:00
igor@rurik.mysql.com
3f1f7102ca sql_view.cc:
A safety correction.
2005-08-12 02:17:27 -07:00
osku@127.(none)
b1c81e43ac Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-12 11:40:02 +03:00
osku@127.(none)
04056ffd3d InnoDB: Print more than 300 characters of queries in various error conditions,
most notably deadlocked ones in SHOW INNODB STATUS. Fixes bug #7819.
2005-08-12 11:39:19 +03:00
igor@rurik.mysql.com
42810cd07a Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-12 01:33:45 -07:00
igor@rurik.mysql.com
da441e949c sql_base.cc:
Fixed bug #12470.
  A misplaced initialization of the cond_count counter
  resulted in a wrong calculation of it. This caused a memory
  corruption since this counter was used as a parameter of
  some memory allocation.
view.test:
  Added a test case for bug #12470.
2005-08-12 01:27:04 -07:00
jimw@mysql.com
898aae5e0f Add SLEEP(seconds) function, which always returns 0 after the given
number of seconds (which can include microseconds). (Bug #6760)
2005-08-11 18:58:22 -07:00
jimw@mysql.com
3a815f45bd Avoid spurious error when restoring INFORMATION_SCHEMA as the current
database after failing to execute a stored procedure in an inaccessible
database. (Bug #12318)
2005-08-11 17:04:16 -07:00
igor@rurik.mysql.com
0aff8a13dc sql_base.cc:
Fixed bug #12382.
  INSERT statement effectively changed thd->set_query_id to 0,
  while SELECT statement changed it to 0. As a result
  the insert_fields function that expanded '*' was called
  with different values of thd->set_query_id for the query
  SELECT * FROM view depending on whether it was run after
  an INSERT or after a SELECT statement. This was corrected
  by restoring the old value of thd->set_query_id when
  returning from the function setup_fields where possible
  reset could occur.
  If the value of thd->set_query_id == 0 then the fields
  substituted instead of '*' were not registered as used
  for bitmaps used_keys. This caused selection of an invalid
  execution plan for the query SELECT * from <view>.
view.result, view.test:
  Added a test case for bug #12382.
2005-08-11 16:10:34 -07:00
vtkachenko@quadxeon.mysql.com
ba8df85719 Merge bk-internal:/home/bk/mysql-5.0
into quadxeon.mysql.com:/users/vtkachenko/bk/mysql-5.0-tmp
2005-08-11 20:19:28 +02:00
acurtis@xiphis.org
ee71edd1fe Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into  xiphis.org:/usr/home/antony/work2/merge-5.0
2005-08-11 18:44:53 +01:00
acurtis@xiphis.org
597b7412c7 fix after merge 2005-08-11 18:42:22 +01:00
jani@ua141d10.elisa.omakaista.fi
1a7af25913 Fixed some warning and error messages so that they use
sql_print_warning() and sql_print_error() instead of fprintf to stderr.
Above functions are tuned for different platforms so that the behavior
is consistent around platforms. Using fprintf() different behavior can
be expected at least on Windows and Unix.
2005-08-11 19:19:20 +03:00
vtkachenko@quadxeon.mysql.com
fc22a36d78 set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h:
Added innodb_commit_concurrency variable
2005-08-11 18:03:01 +02:00
monty@mysql.com
e80252e53c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-08-11 16:43:22 +03:00
monty@mysql.com
7b80e62528 Cleanups during review of new code 2005-08-11 15:58:15 +03:00
acurtis@xiphis.org
b9476f7d50 Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
into  xiphis.org:/usr/home/antony/work2/merge-5.0
2005-08-11 12:18:53 +01:00
bell@51.0.168.192.in-addr.arpa
4f26fa5184 merge 2005-08-11 10:20:06 +03:00
dlenev@mysql.com
0f75d64734 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg11973-2
2005-08-11 10:39:33 +04:00
acurtis@xiphis.org
445bc1336e Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3
into  xiphis.org:/usr/home/antony/work2/p2-bug10109.4
2005-08-10 22:17:53 +01:00
sergefp@mysql.com
9125477df5 Merge mysql.com:/home/psergey/mysql-5.0-bug12228-r4
into mysql.com:/home/psergey/mysql-5.0-bug12228-r5
2005-08-10 21:17:52 +00:00
sergefp@mysql.com
fbab5fc568 BUG#12228: Post review fixes: Added test case, code cleanup. 2005-08-10 21:17:02 +00:00
bell@52.0.168.192.in-addr.arpa
1dff783854 block using QC in case of having tables locked by LOCK... (BUG#12385) 2005-08-10 18:58:55 +03:00
konstantin@mysql.com
8392a814af A fix and a test case for Bug#12243 "MySQL Server crashes with 2
cursors (+ commit)" and Bug#11832 "Server crash with InnoDB + Cursors"
See comments to the changed files.
2005-08-10 18:36:13 +04:00
evgen@moonbone.local
baf0c9ad08 Fix bug #11864 non unique names are allowed in subquery
Column names weren't checked for uniqueness for subqueries.

Code for names uniqueness checking used for view creation moved into 
separate function named check_duplicate_names(). It's called on 
preparation of subqueries to check uniqueness of names. If duplicate names 
are found then error is raised.
2005-08-10 17:45:00 +04:00
hf@deer.(none)
88b01808d9 error message fixed 2005-08-10 16:02:36 +05:00
hf@deer.(none)
a99c04b2db Fix for bug #10499 (Function creation with GEOMETRY return) 2005-08-10 13:45:05 +05:00
mskold@mysql.com
8439de17ab Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-08-10 10:43:17 +02:00
konstantin@mysql.com
f6306a8db1 A fix for Bug#11901 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY join in
subqry order by server crash": failing DBUG_ASSERT(curr_join == this)
when opening a cursor.
Ensure that for top-level join curr_join == join (always), 
and thus fix the failing assert.
curr_join is a hack to ensure that uncacheable subqueries can be
re-evaluated safely, and should be never different from main join
in case of top-level join.
2005-08-10 12:25:26 +04:00
mskold@mysql.com
978d67a9ea Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-08-10 09:52:58 +02:00
mskold@mysql.com
eeecb84050 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-08-10 09:45:05 +02:00
mskold@mysql.com
7ccf9b9708 Added support for ha_ndbcluster::info(HA_STATUS_AUTO) 2005-08-10 09:38:36 +02:00
dlenev@mysql.com
ec5ceecab7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg12280
2005-08-10 10:32:43 +04:00
dlenev@mysql.com
51537c057d Fix for bug #12280 "Triggers: crash if flush tables".
We should not allow FLUSH statement to be executed inside both triggers
and stored functions.
2005-08-10 10:31:32 +04:00
jimw@mysql.com
194360397c Rename rest() macro in my_list.h to list_rest(). (Bug #12327) 2005-08-09 18:02:36 -07:00
dlenev@mysql.com
60511c3df2 Clumsy but working fix for bug #11973 "SELECT .. INTO var_name; in trigger
cause crash on update".

Let us update "thd" pointer in LEX, all its units and in LEX::result before
executing statement in trigger body, since triggers are associated with TABLE
object and because of this can be used in different threads.
2005-08-10 00:23:56 +04:00
evgen@moonbone.local
2a025ffbeb Fix bug #12340 Wrong comparison in ha_innobase::cmp_ref()
When PRIMARY KEY is present ha_innobase::cmp_ref() uses it to compare refs.
After comparing part of key it moves pointers to compare next part.
For varchar parts pointers were moved only by length of parts, not including
bytes containig part length itself. This results in wrong comparision and
wrong number of deleted records.
2005-08-09 22:05:07 +04:00
acurtis@xiphis.org
aa99bd61c0 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into  xiphis.org:/usr/home/antony/work2/p2-bug10109.3
2005-08-09 16:35:51 +01:00
jani@ua141d10.elisa.omakaista.fi
083da3ecee Merged code. 2005-08-09 15:29:33 +03:00
sergefp@mysql.com
b7474403d6 BUG#12228: Pre-review fixes: Fix coding style, handle the case when we're out of memory. 2005-08-09 10:09:11 +00:00
dlenev@mysql.com
82fb0beb9e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-is
2005-08-09 12:57:50 +04:00
dlenev@mysql.com
9a29c1f49e Fix after merging patch solving bug #10055 "Using stored function with
information_schema causes empty result set" with main tree.
2005-08-09 12:56:55 +04:00
monty@mysql.com
c954c09a11 Fixed test that failed on 32 bit systems 2005-08-09 11:21:45 +03:00
dlenev@mysql.com
0c38d33507 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-is
2005-08-09 11:43:55 +04:00
jimw@mysql.com
d6a8330e39 Avoid problems on shutdown by shutting down replication slave threads
after normal connection threads. (Bug #11796)
2005-08-08 18:05:27 -07:00
igor@rurik.mysql.com
253883803b Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-08 16:55:29 -07:00
igor@rurik.mysql.com
73be194f96 subselect.test, subselect.result:
Added a test case for bug #12392.
item_cmpfunc.cc:
  Fixed bug #12392.
  Missing handling of rows containing NULL components
  when evaluating IN predicates caused a crash.
2005-08-08 16:51:12 -07:00
sergefp@mysql.com
c6db76b076 Fix for BUG#12228: SP cache code:
* Cleanup SP Cache code, now SP Cache only deletes sp_head objects in 
  sp_cache_flush_obsolete() invalidates all pointers to routines in the cache.
* Use new SP Cache use contract in the code.

There is no test case because it doesn't seem to be possible to cause thread races to end
the same way they end in heavy-load test. This patch removes the crash in heavy test.
2005-08-08 23:23:34 +00:00
monty@mysql.com
7b1aed3fba Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-08-09 00:15:27 +03:00
monty@mysql.com
99cb083549 Review of new pushed code
- Fixed some error condtion when handling dates with 'T'
- Added extra test for bug #11867 (Wrong result with "... WHERE ROW( a, b ) IN ( SELECT DISTINCT a, b WHERE ...)" to show it's not yet fixed
- Safety fixes and cleanups
2005-08-09 00:13:49 +03:00
patg@krsna.patg.net
6128521b5b item_strfunc.cc:
BUG #11104 
      Took out the offset-=delimiter_length-1 out of the for loop. It was causing
      basically this: 
      select substring_index('the king of the the hill', 'the', -2) to not work.
      The first iteration, offset would be initialised to 24, then strstr would 
      point at 'the king of the the* hill' ('*'means right before the 
      character following), returning a offset of 16. The for loop would then 
      decrement offset by two (3 - 1), to 14, now pointing at 
      "the king of th*e the hill", _skipping_ past the 'e' in the second to last
      'the', and therefore strstr would never have a chance of matching the 
      second to last 'the', then moving on to the 'the' at the begginning of the 
      string!
      In a nutshell, offset was being decremented by too great a value, preventing
      the second to last 'the' from being ever found, hence the result of 
      'king of the the hill' from the query that is reported in the bug report
func_str.test:
  BUG #11104
  Added tests to make sure fix addresses issues in original bug report
func_str.result:
  BUG #11104 
  New results for new tests
2005-08-08 13:46:13 -07:00