mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25501 commits 2784 branches 343 tags 1.6 GiB
Commit graph

25501 commits

This branch
This branch
All branches
Author SHA1 Message Date
igor@rurik.mysql.com
bbd04e6bcf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-22 17:33:59 -07:00
hartmut@mysql.com
d74a148172 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0
 2005-08-22 23:03:24 +02:00
hartmut@mysql.com
8859ab64d1 added file missing from release to EXTRA_DIST list (bug# 12733) 2005-08-22 22:13:56 +02: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
monty@mishka.local
7767828b81 Don't write first even that contains server version 2005-08-22 19:56:36 +03:00
igor@rurik.mysql.com
8c34d8e578 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-22 09:40:10 -07:00
konstantin@mysql.com
fb7be5270f Add a comment about I_List<> copy constructor. 2005-08-22 19:23:01 +04:00
konstantin@mysql.com
c75cfc358e Fix a -ansi -pedantic compile failure. 2005-08-22 18:59:47 +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
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
jonas@eel.(none)
f4f63f0351 ndb - 
Fix merge error
 2005-08-22 11:34:33 +02:00
jonas@eel.(none)
d7349750e5 ndb - bug#12220 
forgott to add KeyDescriptor.hpp
 2005-08-22 11:25:03 +02:00
jonas@eel.(none)
90256d31d1 bug#12220 - ndb - node recovery with charsets 
LQH computes incorrect hash values during NR (as it doesn't concider charsets)

  Solution: make LQH compute correct hash :-)
           1) move xfrm_key into SimulatedBlock so that there's _one_ impl.
           2) make TC, ACC, LQH use same impl.
 2005-08-22 10:59:25 +02:00
monty@mishka.local
d62295e44e Cleanup during review of new pushed code 2005-08-22 01:13:37 +03:00
jonas@eel.(none)
daec6e5ebd Merge eel.(none):/home/jonas/src/mysql-4.1-push 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-21 16:24:53 +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
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
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
5340e04661 Bug #12460 Table Full 
On 64 bit platforms the changed statement doesn't work
so making sure that the larger value is first and using
subtraction is a quick and backwards-compatible fix of this
line.
 2005-08-20 10:07:46 -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
stewart@mysql.com
9a3168da82 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug10950
 2005-08-20 17:58:33 +10:00
igor@rurik.mysql.com
1730f26caf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-19 22:06:43 -07:00
igor@rurik.mysql.com
c4f677feb5 Manual merge 2005-08-19 20:21:09 -07: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
elliot@mysql.com
00fd26baeb Add test that got dropped in automerge 2005-08-19 19:08:47 -04: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
elliot@mysql.com
24f81a781e Fix wrong auto-merge. 2005-08-19 18:17:54 -04:00
elliot@mysql.com
e9ca1bd3a7 Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/home/emurphy/src/work/mysql-5.0
 2005-08-19 18:13:31 -04: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
serg@sergbook.mysql.com
c234386a40 the syntax is XA END xid [SUSPEND [FOR MIGRATE]] 2005-08-19 18:00:16 +04:00
petr@mysql.com
6c03c9252d Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-08-19 17:22:53 +04:00
petr@mysql.com
5605117d4d Fix for BUG#10957 "stop instance, issued after flush instances causes IM to crash" 
Recommited with post-review fixes
 2005-08-19 17:19:12 +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
jonas@eel.(none)
6371e9a23f ndb 
remove grep stuff
 2005-08-19 13:20:36 +02:00
heikki@hundin.mysql.fi
d9bbf7bc53 btr0sea.c: 
Add diagnostic code to track a crash in adaptive hash indexes; the crash may happen if block->index == NULL
 2005-08-19 12:54:13 +03: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