tomas@poseidon.ndb.mysql.com
f6d51a44f4
Merge
2005-06-04 19:26:35 +02:00
monty@mysql.com
0dd94ed426
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-06-03 01:16:29 +03:00
monty@mysql.com
ed5774f0c3
Removed duplicated and wrong merged code
2005-06-03 01:15:56 +03: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
2dca9d5953
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-02 10:44:48 +02:00
brian@zim.(none)
113a99626d
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
2005-06-01 21:56:30 -07:00
brian@zim.(none)
efb5ed5bab
Merge
2005-06-01 18:48:29 -07:00
brian@zim.(none)
ba9b9f8993
Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
2005-06-01 17:34:10 -07:00
tomas@poseidon.ndb.mysql.com
c82cb2c26a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-01 17:41:36 +02:00
lars@mysql.com
2b3c8b9dc5
BUG#6883: Added tests for create/drop temporary table, UNLOCK TABLES
...
If a create table can not do implicit commit, the stmt now fails
CREATE/DROP TEMPORARY TABLE is now flushed to binlog
2005-06-01 15:52:32 +02:00
ingo@mysql.com
4a25417394
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
After merge fixes.
2005-06-01 13:22:17 +02:00
ingo@mysql.com
0a1e38b7ed
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
Manual merge from 4.1.
2005-06-01 11:15:21 +02:00
tomas@poseidon.ndb.mysql.com
1b029b1c06
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-05-31 21:30:26 +02:00
ingo@mysql.com
c420599581
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
Hand merged from 4.0.
2005-05-31 19:37:24 +02:00
pem@mysql.comhem.se
76073d7bf5
Fixed BUG#9529: Stored Procedures: No Warning on truncation of procedure name
...
during creation.
Although it returns an error, consistent with the behaviour for other objects.
(Unclear why we would allow the creation of SPs with truncated names.)
2005-05-31 18:36:32 +02:00
tomas@poseidon.ndb.mysql.com
5088b28d09
Merge
2005-05-31 14:37:47 +02:00
pem@mysql.com
53abbdc39b
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-05-31 12:07:16 +02:00
pem@mysql.comhem.se
063896a6e7
Post-review fixes of BUG#9937: Crash on call to stored procedure.
2005-05-31 12:06:15 +02:00
ingo@mysql.com
51d80960ea
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
1.) Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
Used the new option in create_table_from_items().
It is necessary to prevent the SELECT table from being reopend.
It would get new storage assigned for its fields, while the
SELECT part of the command would still use the old (freed) storage.
2.) Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
against a global read lock. This prevents a deadlock in
CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
and avoids the creation of new tables during a global read lock.
3.) Replaced set_protect_against_global_read_lock() and
unset_protect_against_global_read_lock() by
wait_if_global_read_lock() and start_waiting_global_read_lock()
in the INSERT DELAYED handling.
2005-05-31 11:08:14 +02:00
konstantin@mysql.com
e315f903d0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-7306-new
2005-05-30 20:56:11 +04:00
konstantin@mysql.com
2d6a70c42a
Preparatory (and the most problematic) patch for Bug#7306
...
"the server side preparedStatement error for LIMIT placeholder",
which moves all uses of LIMIT clause from PREPARE to OPTIMIZE
and later steps.
After-review fixes.
2005-05-30 20:54:37 +04:00
pem@mysql.com
e496b24304
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-05-30 11:06:31 +02:00
msvensson@neptunus.(none)
cf3e568495
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-27 18:30:35 +02:00
msvensson@neptunus.(none)
a07d8b1951
Merge neptunus.(none):/home/msvensson/mysql/bug9993
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-27 17:22:19 +02:00
gluh@eagle.intranet.mysql.r18.ru
26e9e13c26
Fix for bug #9992 : mysql_next_result hangs on error
...
set net->no_send_error to 0 before execution of each element of
multiquery statement to provide the sending of error to client
2005-05-27 18:01:09 +05:00
lars@mysql.com
54bf811ada
BUG#6883: Added implicit commit for CREATE TABLE, TRUNCATE TABLE and DROP/CREATE DATABASE
2005-05-27 04:17:33 +02:00
msvensson@neptunus.(none)
697cfe7f07
Merge from 4.1
2005-05-26 21:01:55 +02:00
pem@mysql.comhem.se
3eca4bf22e
Fixed BUG#9937: Crash on call to stored procedure.
...
This only showed up on two known platforms, both ia64 (one HP-UX and one Linux wich icc).
For some reason, they only get half the stack size they are supposed to have, which
makes deep SP recursion overrun the stack before check_stack_overrun() is triggered.
Also made som minor fixes in the check_stack_overrun() definition, supporting variable
margins.
No test case added, but the reason for the bug report was a failed existing test case
on these machines, which now works.
2005-05-26 20:36:14 +02:00
msvensson@neptunus.(none)
8401cd5d79
BUG#9993 2 unexpected warnings when dropping a routine and --skip-grant-tables
...
- Dont perform automatic privilege handling for stored procedures when server is started --skip-grant-tables
- Renamed view_skip_grants to skip_grants and added test cases for this
2005-05-26 16:44:46 +02:00
monty@mysql.com
6d5d6c9257
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-05-25 12:57:29 +03:00
monty@mysql.com
fb90aaa7b5
Cleanup during code review
...
Faster detection of wrong table names (like PRN) on windows
2005-05-25 12:56:47 +03:00
acurtis@xiphis.org
4a77febaab
Merge
2005-05-24 15:52:48 +01:00
acurtis@xiphis.org
72f9abbf76
Add comments
2005-05-24 13:38:46 +01:00
acurtis@xiphis.org
a6a589ef76
Bug#7241 - Invalid response when DELETE .. USING and LOCK TABLES used.
...
Only acquire necessary write lock for multi-delete
2005-05-24 11:44:34 +01:00
ndbdev@dl145c.mysql.com
30def9f3f8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-23 10:45:48 +02:00
monty@mysql.com
0b75f6e37b
compatibility issues
...
Fixed errors reported by valgrind (some errors in NDB remains)
2005-05-20 16:14:35 +03:00
tulin@dl145c.mysql.com
03590c20bd
merge
2005-05-18 22:26:23 +02:00
ramil@mysql.com
86538b338b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/ram/work/5.0.b6267
2005-05-18 12:41:36 +05:00
tulin@dl145c.mysql.com
4a1d6f6a18
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-17 23:25:13 +02:00
acurtis@xiphis.org
8df5887ad5
Bug#10246 - Parser: bad syntax for GRANT EXECUTE
...
Rename some functions
more fine-grained sp privileges
make grant/revoke sp grammar less ambigious
2005-05-17 19:54:20 +01:00
tulin@dl145c.mysql.com
23f79bd1f2
merge
2005-05-17 10:17:53 +02:00
ramil@ram-book.(none)
d85e052d71
a fix (bug #6267 : ENUM ... NOT NULL w/o default treated differently than other data types).
...
the behavior of enum changed to be consistent.
2005-05-13 16:44:14 +05:00
igor@rurik.mysql.com
3351233349
Manual merge
2005-05-10 16:41:47 -07:00
igor@rurik.mysql.com
9d4b228b61
Many files:
...
Fixed bug #8528 .
Representation for single-table views was made similar to
representation for multi-table views.
view.test:
Added test case for bug #8528 .
view.result:
Added test case for bug #8528 . Fixed other test cases.
2005-05-10 16:31:13 -07: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
holyfoot@hf-ibm.(none)
5ddaf35c26
Fix for bug #9632 (strict.test fails in -embedded-server mode)
2005-05-09 16:26:06 +05:00
lars@mysql.com
e76c641190
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
2005-05-09 11:45:59 +02:00
lars@mysql.com
3ff9aa5fa1
After merge fixes
2005-05-09 11:43:09 +02:00
lars@mysql.com
05cbb3962c
Manual merge 5.0->5.1
2005-05-06 15:04:07 +02:00
monty@mishka.local
015cd1cd21
merge
2005-05-06 13:51:58 +03:00