tomas@poseidon.ndb.mysql.com
674b6bb151
Merge
2005-07-12 20:01:22 +02:00
monty@mysql.com
ec420bfb43
Fixes during review of new code
...
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
2005-07-04 03:42:33 +03:00
bell@sanja.is.com.ua
a771b57172
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-06-23 21:45:53 +03: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
bell@sanja.is.com.ua
50784392aa
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-06-23 18:30:59 +03:00
bell@sanja.is.com.ua
56b2fc10a8
fixed environment restoring in case of error during SP function execution (BUG#9503)
...
#define macro improvement
2005-06-23 18:29:10 +03:00
ndbdev@dl145b.mysql.com
053dd260ee
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-23 01:51:49 +02:00
konstantin@mysql.com
6a0adade83
Remove THD::stmt_backup
2005-06-22 23:12:25 +04:00
ndbdev@dl145b.mysql.com
dcef1c7532
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-22 19:07:29 +02:00
konstantin@mysql.com
a1bec5666f
Adjust to the changed Query_arena constructor:
...
main_mem_root is moved out of class Query_arena.
2005-06-22 11:59:13 +04:00
tulin@dl145b.mysql.com
e5d9fb51a0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-21 19:15:23 +02:00
konstantin@mysql.com
9eb671459a
A preparatory patch to help adding JOIN::transform() and move one-time
...
query transformations to the PREPARE stage (prepared statements).
2005-06-21 21:15:21 +04:00
tulin@dl145b.mysql.com
ebc2050c25
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-17 23:13:38 +02:00
konstantin@mysql.com
362a83d2f2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-10736
2005-06-17 23:27:23 +04:00
konstantin@mysql.com
b3d977df10
Rename all prepared statements COM_ commands to prefix with COM_STMT_
2005-06-17 23:26:25 +04:00
serg@serg.mylan
516d0945a1
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-17 11:29:55 +02:00
ndbdev@dl145b.mysql.com
7641b50fb6
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-17 08:13:57 +02:00
konstantin@mysql.com
4f966145b0
Post-merge fixes.
2005-06-17 01:58:36 +04:00
konstantin@mysql.com
62dacf0813
Manual merge (4.1->5.0)
2005-06-17 00:34:35 +04:00
konstantin@mysql.com
f10b395982
A fix for Bug#9141 "4.1 does not log into slow log
...
ALTER, OPTIMIZE and ANALYZE statements".
In 4.1 we disabled logging of slow admin statements. The fix adds an
option to enable it back.
No test case (slow log is not tested in the test suite), but tested
manually.
+ post-review fixes (word police mainly).
2005-06-16 23:05:38 +04:00
serg@serg.mylan
01b3c70926
renamed:
...
Item_buff -> Cached_item
Item_arena -> Query_arena
TEST_ASSERT -> YYERROR_UNLESS
2005-06-15 19:58:35 +02:00
tulin@dl145b.mysql.com
b1a3d74f20
merge
2005-06-07 19:38:28 +02:00
konstantin@mysql.com
8c0767cef5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-7306-final
2005-06-07 16:28:08 +04:00
ndbdev@dl145b.mysql.com
74f1b22b86
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 13:42:57 +02:00
dlenev@mysql.com
054139fc64
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg10015
2005-06-07 14:54:48 +04:00
dlenev@brandersnatch.localdomain
270b695f59
Fix for bug #10015 "Crash in InnoDB if stored routines are used".
...
We should not allow explicit or implicit transaction commits inside
of stored functions or triggers (so in autocommit mode we should not
do commits after execution of sub-statement).
Also since we don't support nested statement transactions in 5.0,
we shouldn't commit or rollback stmt transactions while we are inside
stored functions or triggers. This should be fixed in later (>=5.1)
releases.
2005-06-07 14:53:08 +04:00
ndbdev@dl145b.mysql.com
723173c0f3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 12:50:45 +02:00
konstantin@mysql.com
ac2a9eb699
Manual merge.
2005-06-07 14:50:45 +04:00
konstantin@mysql.com
9f379d7f05
Patch two (the final one) for Bug#7306 "the server side preparedStatement
...
error for LIMIT placeholder".
The patch adds grammar support for LIMIT ?, ? and changes the
type of ST_SELECT_LEX::select_limit,offset_limit from ha_rows to Item*,
so that it can point to Item_param.
2005-06-07 14:11:36 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
f2933263fb
A fix for systems that don't have HAVE_MMAP defined.
...
Moved some variable externs from sql_class.h to mysql_priv.h
2005-06-07 11:30:09 +03:00
ndbdev@dl145b.mysql.com
161a58ab4b
merge
2005-06-06 23:39:19 +02:00
monty@mysql.com
4b7882dc73
merge
2005-06-05 17:19:50 +03:00
tomas@poseidon.ndb.mysql.com
f6d51a44f4
Merge
2005-06-04 19:26:35 +02:00
konstantin@mysql.com
123bcb9d8d
Give Item_arena::is_stmt_prepare a more descriptive name (it marks
...
the code that is active for SP as well in 5.0)
2005-06-03 00:02:47 +04:00
tomas@poseidon.ndb.mysql.com
5088b28d09
Merge
2005-05-31 14:37:47 +02:00
monty@mysql.com
7538ce70d5
Fixed bug in multiple-table-delete where some rows was not deleted
2005-05-30 20:48:40 +03:00
sergefp@mysql.com
59db44382b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2
2005-05-26 21:01:53 +02:00
sergefp@mysql.com
b6179919f3
Change Last_query_cost status variable from global to thread-local.
2005-05-18 05:39:10 +02:00
mronstrom@mysql.com
c33a0673a6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/Users/mikron/wl1682
2005-05-12 12:01:01 +02:00
ndbdev@dl145b.mysql.com
58aa78e32d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-09 20:28:54 +02:00
msvensson@neptunus.(none)
34cec09efb
Merge neptunus.(none):/home/msvensson/mysql/bug10241
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-09 11:26:48 +02:00
lars@mysql.com
05cbb3962c
Manual merge 5.0->5.1
2005-05-06 15:04:07 +02:00
holyfoot@hf-ibm.(none)
2c8e9df232
A lot of fixes to Precision math
...
Mostly about precision/decimals of the results of the operations
2005-05-05 20:06:49 +05:00
msvensson@neptunus.(none)
5b5565c30a
BUG#10241 cygwin port: invalid pragma interface directives
...
- Introduce ifdefs so we can control when to use #pragma interface on cygwin
2005-05-04 15:05:56 +02:00
mronstrom@mysql.com
21347433cf
WL 1682: Use bitvector instead of query_id to tell handler which fields
...
to read and write
Changed Server code, added new interface to handler and changed the
NDB handler, InnoDB handler and Federated handler that previously used
query_id
Bug#10202 fix (one-liner fix for memory leak)
2005-04-28 14:45:27 +02:00
lars@mysql.com
1bd55e471e
Merging 5.0->5.1
2005-04-19 11:09:54 +02:00
serg@serg.mylan
c796ea598c
Merge
2005-04-05 13:23:11 +02:00
serg@serg.mylan
810b2c3d40
remove the rest of isam/merge references
...
fix a race condition in TC_LOG_BINLOG::unlog
2005-04-05 13:17:49 +02:00
monty@mysql.com
48de1ff277
Don't generate message in send_kill_message() if wrong data. (Caused core dump for wrong data in ALTER TABLE on some system)
2005-04-05 01:19:48 +03:00
monty@mysql.com
04f8e164fb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-04 16:45:23 +03:00