mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24012 commits 2793 branches 343 tags 1.7 GiB
Commit graph

24012 commits

This branch
This branch
All branches
Author SHA1 Message Date
igor@rurik.mysql.com
abe8ec4be2 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-23 11:22:32 -07:00
svoj@mysql.com
539d63d09a Merge mysql.com:/home/svoj/devel/mysql/mysql-5.0.8-build 
into mysql.com:/home/svoj/devel/mysql/mysql-5.0.9
 2005-06-23 23:22:31 +05:00
igor@rurik.mysql.com
268110b34b Manual merge 2005-06-23 11:22:30 -07:00
konstantin@mysql.com
1e84070459 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-sp_instr
 2005-06-23 22:22:30 +04:00
sergefp@mysql.com
0a5223bf8a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug8441
 2005-06-23 20:22:29 +02:00
sergefp@mysql.com
2942b06a2c Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug8441
 2005-06-23 19:41:42 +02:00
igor@rurik.mysql.com
1c348f48a9 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
 2005-06-23 10:06:35 -07:00
sergefp@mysql.com
009e2457d9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10151
 2005-06-23 19:06:34 +02:00
evgen@moonbone.local
be76efab84 sql_parse.cc: 
Fix for fix for bug #9728
  Error caused server hang on prepared insert ... select
 2005-06-23 21:06:33 +04:00
sergefp@mysql.com
f1085fb3be Merge 2005-06-23 19:05:36 +02:00
svoj@mysql.com
367017d630 WL#2286 - Compile MySQL w/YASSL support 
Fix for compilation failure with Forte Developer C++.
 2005-06-23 21:29:44 +05:00
konstantin@mysql.com
9e3c7d2262 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-sp_instr
 2005-06-23 20:23:23 +04:00
konstantin@mysql.com
4c4079430d - implement inheritance of sp_instr: public Query_arena. 
We need every instruction to have its own arena, because we want to
  track instruction's state (INITIALIZED_FOR_SP -> EXECUTED). Because of 
  `if' statements and other conditional instructions used in stored 
  procedures, not every instruction of a stored procedure gets executed 
  during the first (or even subsequent) execution of the procedure. 
  So it's better if we track the execution state of every instruction 
  independently.
  All instructions of a given procedure now also share sp_head's 
  mem_root, but keep their own free_list.
  This simplifies juggling with free Item lists in sp_head::execute.
- free_items() moved to be a member of Query_arena. 
- logic of 'backup_arena' debug member of Query_arena has been
  changed to support
  multi-backups. Until now, TRUE 'backup_arena' meant that there is
  exactly one active backup of the THD arena. Now it means simply that
  the arena is used for backup, so that we can't accidentally overwrite an 
  existing backup. This allows doing multiple backups, e.g. in
  sp_head::execute and Cursor::fetch, when THD arena is already backed up
  but we want to set yet another arena (usually the 'permanent' arena,
  to save permanent transformations/optimizations of a parsed tree).
 2005-06-23 20:22:08 +04:00
kent@mysql.com
a4d86cf434 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-06-23 17:46:00 +02:00
kent@mysql.com
ffff7cb314 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-06-23 17:41:42 +02:00
kent@mysql.com
025305c1cd mysql-test-run.pl: 
Might need a restart after test with special TZ
  Removed unused argument to run_mysqltest()
 2005-06-23 17:38:40 +02:00
sergefp@mysql.com
1e7cfe1e21 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10151
 2005-06-23 17:12:04 +02:00
igor@rurik.mysql.com
d09fd92535 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
 2005-06-23 06:19:28 -07:00
igor@rurik.mysql.com
c73c2af614 func_str.result, func_str.test: 
Added a test case for bug #10124.
sql_select.h, item_subselect.cc, sql_select.cc:
  Fixed bug #10124.
  The copy method of the store_key classes can return
  STORE_KEY_OK=0, STORE_KEY_FATAL=1, STORE_KEY_CONV=2 now.
field.cc:
  Fixed bug #10124.
  When ussuing a warning the store methods return 2 instead of 1 now.
 2005-06-23 06:15:50 -07:00
svoj@mysql.com
23a2643cb6 Merge mysql.com:/home/svoj/devel/mysql/mysql-5.0.8-build 
into mysql.com:/home/svoj/devel/mysql/mysql-5.0.9
 2005-06-23 17:52:28 +05:00
igor@rurik.mysql.com
4c9107696f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-06-23 04:12:53 -07:00
igor@rurik.mysql.com
c63914c0b3 opt_range.cc: 
Identation correction.
 2005-06-23 04:10:43 -07:00
lenz@mysql.com
fbbe0b750d Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-5.0-build
 2005-06-23 13:10:42 +02:00
igor@rurik.mysql.com
4f93e84103 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-23 04:10:42 -07:00
sergefp@mysql.com
d66770b5e6 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-back-vac-look
 2005-06-23 11:10:41 +00:00
svoj@mysql.com
b720c6e535 WL#2286 - Compile MySQL w/YASSL support 
Fix for "multiple definition of __cxa_pure_virtual" link failure
when compiling with icc.
 2005-06-23 16:04:10 +05:00
lenz@mysql.com
a5e8bce119 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-06-23 12:03:10 +02:00
lenz@mysql.com
a190236e0a Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0.8-clone
 2005-06-23 11:41:01 +02:00
lenz@mysql.com
cacb7199d3 - manual merge of the new node names 2005-06-23 11:34:58 +02:00
lenz@mysql.com
03b128971e - fixed text file generation - the node names in the info page had changed 2005-06-23 11:30:40 +02:00
igor@rurik.mysql.com
893c6c9b46 opt_range.cc: 
Fixed buf #11487.
  Added a call of  QUICK_RANGE_SELECT::init to the
  QUICK_RANGE_SELECT::reset method. Without it the second
  evaluation of a subquery employing the range access failed.
subselect.result, subselect.test:
  Added a test case for bug #11487.
 2005-06-23 02:08:30 -07:00
sergefp@mysql.com
fc75403b4d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10151
 2005-06-23 11:03:21 +02:00
reggie@mdk10.(none)
98ddf74dd3 Merge mdk10.(none):/home/reggie/bk/bug9148 
into mdk10.(none):/home/reggie/bk/mysql-5.0-base
 2005-06-22 18:51:48 -05:00
evgen@moonbone.local
4ddc13af42 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-merge
 2005-06-23 03:51:47 +04:00
evgen@moonbone.local
dc65464688 insert_update.result, insert_update.test, sql_base.cc: 
Fix for bugfix #9728 merge
 2005-06-23 03:51:10 +04:00
evgen@moonbone.local
5c8e3341d3 Bug #9728 fix merge 2005-06-23 01:02:43 +04:00
patg@radha.local
7f5d7d47b3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into radha.local:/Volumes/disk2s1/mysql-5.0
 2005-06-22 21:23:33 +02:00
konstantin@mysql.com
6a0adade83 Remove THD::stmt_backup 2005-06-22 23:12:25 +04:00
lars@mysql.com
53761ce08f Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1 2005-06-22 20:59:33 +02:00
reggie@mdk10.(none)
705992719a Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/bug9148
 2005-06-22 13:59:32 -05:00
sergefp@mysql.com
3196513258 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10151
 2005-06-22 20:59:32 +02:00
evgen@moonbone.local
54d3b00184 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/mysql-4.1-bug-8147
 2005-06-22 22:59:31 +04:00
evgen@moonbone.local
6b9df50c5e item.h: 
Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
  Have to return false to set flag for whole expression.
 2005-06-22 22:58:44 +04:00
patg@radha.local
144045ffae Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into radha.local:/Volumes/disk2s1/mysql-5.0
 2005-06-22 19:40:46 +02:00
patg@radha.local
172dab875b Bug# 9926, This is the same as changeset 1.1934, which was approved by Monty 2005-06-22 19:29:34 +02:00
kent@mysql.com
0c72aa5ef2 mtr_cases.pl: 
Add a slave when running the federated test case
 2005-06-22 19:07:34 +02:00
elliot@mysql.com
bafab2dd6f Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
 2005-06-22 13:07:33 -04:00
elliot@mysql.com
0f92a2cfd6 Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
 2005-06-22 13:07:32 -04:00
kent@mysql.com
35c939d3c4 mysql-test-run.pl: 
Bug#11481, set charset directory to mysqlbinlog
 2005-06-22 19:07:31 +02:00
elliot@mysql.com
776fc4364f Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1-merge2 
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
 2005-06-22 13:07:31 -04:00