heikki@hundin.mysql.fi
9300833c91
univ.i, page0page.ic:
...
Add a sanity check to page_rec_is_comp; a new univ.i macro UNIV_RELEASE_NOT_YET_STABLE controls such sanity checks that we will remove after the release is stable enough
2005-09-03 19:15:37 +03:00
heikki@hundin.mysql.fi
0428fec7c7
row0sel.c:
...
Fix a wrong debug assert in the previous patch
2005-09-03 12:48:41 +03:00
heikki@hundin.mysql.fi
92f034332a
row0sel.c:
...
Add more comments to row_search_for_mysql() and remove the ugly double use of the variable rec in that function
2005-09-03 12:32:38 +03:00
heikki@hundin.mysql.fi
cfdb60b6b2
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-09-03 12:30:14 +03:00
jonas@eel.(none)
613258e0b4
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-03 07:58:43 +02:00
eric@mysql.com
5d00d56f17
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/eric/bktmp/mysql-5.0
2005-09-02 17:14:23 -07:00
eric@mysql.com
5a8af4cb9e
Backport of JimW's localhost patch to 4.1 tree.
...
Handle systems like default FC4 where 127.0.0.1 doesn't always map to 'localhost' first.
(Bug #11822 )
2005-09-02 17:07:05 -07:00
konstantin@mysql.com
aac74557db
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kostja/mysql/mysql-5.0-dsql3
2005-09-03 03:25:59 +04:00
konstantin@mysql.com
38486e83c1
Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures".
...
The idea of the patch is to separate statement processing logic,
such as parsing, validation of the parsed tree, execution and cleanup,
from global query processing logic, such as logging, resetting
priorities of a thread, resetting stored procedure cache, resetting
thread count of errors and warnings.
This makes PREPARE and EXECUTE behave similarly to the rest of SQL
statements and allows their use in stored procedures.
This patch contains a change in behaviour:
until recently for each SQL prepared statement command, 2 queries
were written to the general log, e.g.
[Query] prepare stmt from @stmt_text;
[Prepare] select * from t1 <-- contents of @stmt_text
The chagne was necessary to prevent [Prepare] commands from being written
to the general log when executing a stored procedure with Dynamic SQL.
We should consider whether the old behavior is preferrable and probably
restore it.
This patch refixes Bug#7115, Bug#10975 (partially), Bug#10605 (various bugs
in Dynamic SQL reported before it was disabled).
2005-09-03 03:13:18 +04:00
heikki@hundin.mysql.fi
a963f5970f
row0sel.c:
...
Fix bug #12947 : a consistent read could return inconsistent results; this bug was introduced in 5.0.5
2005-09-03 01:38:37 +03:00
hartmut@mysql.com
14485e71c2
fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX
2005-09-02 22:52:52 +02:00
jimw@mysql.com
0e323e566d
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-02 12:42:00 -07:00
jimw@mysql.com
9dc0da7c46
Merge mysql.com:/home/jimw/my/mysql-4.1-11280
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-02 12:12:36 -07:00
eric@mysql.com
6e04afe8f9
delete row now pulls error message from remote server.
...
Added test cases with archive (where delete & update will always fail)
http://bugs.mysql.com/bug.php?id=12659
2005-09-02 11:40:21 -07:00
joerg@mysql.com
ed093d581a
Compile error fix.
2005-09-02 20:07:08 +02:00
bell@sanja.is.com.ua
8553349638
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-09-02 17:06:15 +03:00
konstantin@mysql.com
a3ddcdf8fb
Rename:
...
- current_arena to stmt_arena: the thread may have more than one
'current' arenas: one for runtime data, and one for the parsed
tree of a statement. Only one of them is active at any moment.
- set_item_arena -> set_query_arena, because Item_arena was renamed to
Query_arena a while ago
- set_n_backup_item_arena -> set_n_backup_active_arena;
the active arena is the arena thd->mem_root and thd->free_list
are currently pointing at.
- restore_backup_item_arena -> restore_active_arena (with the same
rationale)
- change_arena_if_needed -> activate_stmt_arena_if_needed; this
method sets thd->stmt_arena active if it's not done yet.
2005-09-02 17:21:19 +04:00
bell@sanja.is.com.ua
d67c683404
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-09-02 15:56:14 +03:00
jonas@eel.(none)
b44b36bd1f
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-09-02 14:17:56 +02:00
jonas@eel.(none)
fda35a632c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-09-02 13:21:29 +02:00
lars@mysql.com
5fe6cbf771
Removed redundant case in Makefile.am
2005-09-02 12:20:18 +02:00
jonas@eel.(none)
7eed7760c7
Merge eel.(none):/home/jonas/src/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-09-02 12:09:54 +02:00
jonas@eel.(none)
03f7901193
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-02 12:06:43 +02:00
jonas@eel.(none)
892f0964a8
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-5.0
2005-09-02 12:03:58 +02:00
lars@mysql.com
4a2d37926c
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2005-09-02 11:56:53 +02:00
jonas@eel.(none)
4b80ed1bde
ndb - fix printout related to bug#10987
2005-09-02 11:55:41 +02:00
jonas@eel.(none)
b267176708
ndb - bug#12608
...
Always abort if node failure occured between startTransaction and commit
(can later be improved by wl#2610)
2005-09-02 11:50:50 +02:00
jonas@eel.(none)
3a555b999c
ndb - bug #10987
...
make sure not to cut log to early
(specificly not use LCP with maxGciStarted that has not yet completed)
2005-09-02 11:47:24 +02:00
msvensson@neptunus.(none)
375dc1531c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-02 11:21:59 +02:00
msvensson@neptunus.(none)
d2d1d01f76
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-02 11:19:46 +02:00
msvensson@neptunus.(none)
78f32604ac
mysqltest.test: Remove output from shells in result file
2005-09-02 11:14:47 +02:00
kent@mysql.com
5b65d8fb03
my_global.h:
...
Back port of QNX work around for rint()
2005-09-02 11:11:29 +02:00
stewart@mysql.com
bfd4b626a1
BUG#11607 Incorrect error code returned on deletion
...
Save error on first failure.
At end of execute, if the current error is 4350 (transaction already aborted), restore
the original error (if there was one).
2005-09-02 19:09:20 +10:00
lars@mysql.com
198350d630
Merge mysql.com:/users/lthalmann/bk/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2005-09-02 11:01:00 +02:00
kent@mysql.com
5e5184752d
configure.in:
...
Back port of code to find the right 'ps' settings
2005-09-02 10:44:20 +02:00
bar@mysql.com
98a5362c1e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12363
2005-09-02 12:01:19 +05:00
bell@sanja.is.com.ua
cb0d8ade1e
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-09-02 09:55:24 +03:00
bell@sanja.is.com.ua
2434c8af4b
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-09-02 09:51:32 +03:00
bell@sanja.is.com.ua
da64c1eab3
postmerge changes
2005-09-02 09:50:17 +03:00
msvensson@neptunus.(none)
d0a78f4dcc
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-02 08:38:48 +02:00
bar@mysql.com
5e3eb3d21e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12363
2005-09-02 11:19:43 +05:00
bar@mysql.com
50f622ab04
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-02 10:40:06 +05:00
bar@mysql.com
252ed3a24c
sp_head.cc:
...
Fix crash reported in bug 12849.
It doesn't fix the whole problem though.
Let Pem fix it later.
2005-09-02 10:35:51 +05:00
lars@mysql.com
9d8f51fe3a
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
2005-09-02 01:37:16 +02:00
dlenev@mysql.com
c30c632117
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-09-02 01:23:31 +04:00
dlenev@mysql.com
9dcae4c09b
Fixes after merging fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES
...
and GRANT in multi-threaded environment" into 5.0 tree.
2005-09-02 01:01:33 +04:00
joerg@mysql.com
541b65ef64
Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M40/mysql-4.0
2005-09-01 22:23:09 +02:00
joerg@mysql.com
4b677dfa59
Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M50/merge-5.0
2005-09-01 21:54:18 +02:00
joerg@mysql.com
1c07995d8a
Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0
2005-09-01 21:48:10 +02:00
bell@sanja.is.com.ua
dd7ab17059
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-09-01 22:42:37 +03:00