bell@sanja.is.com.ua
bfdb6ca3cf
store SERVER_MORE_RESULTS_EXISTS in key of query cache (BUG#6897)
2005-07-23 07:51:25 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
8f10662eab
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2005-07-23 00:15:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2657e48c64
Faster alter table code for 5.1.
2005-07-22 23:43:59 +03:00
jimw@mysql.com
49e5636410
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-22 12:35:15 -07:00
jimw@mysql.com
6eae678f56
Fix error message generated when trying to create a table in a
...
non-existent database. (Bug #10407 )
2005-07-21 20:08:54 -07:00
ndbdev@dl145b.mysql.com
f4fe2c3b71
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-21 08:06:26 +02:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
6026054ead
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-07-21 01:29:57 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
9663b9a974
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
2005-07-20 21:58:33 -04:00
mronstrom@mysql.com
4cb963439a
Bug #10600 After review fixes
2005-07-20 21:19:01 +02:00
tulin@dl145b.mysql.com
bf6e3f9aa8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-20 07:53:10 +02:00
jimw@mysql.com
2a06e5756e
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:32 -07:00
tulin@dl145b.mysql.com
a6c21a0791
merge
2005-07-19 21:56:10 +02:00
jimw@mysql.com
80c1c6b33f
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 11:05:49 -07:00
monty@mishka.local
7e83d09ce7
Simple fixes during review of new code
2005-07-19 19:25:05 +03:00
dlenev@mysql.com
8a3e723b74
Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch)
...
"Triggers have the wrong namespace"
"Triggers: duplicate names allowed"
"Triggers: CREATE TRIGGER does not accept fully qualified names"
"SHOW TRIGGERS"
2005-07-19 20:06:49 +04:00
mronstrom@mysql.com
2d23c691f7
Bug #10600
...
remove_table_from_cache fails to signal other thread and gets
blocked when other thread also gets blocked
2005-07-19 00:29:19 +02:00
mronstrom@mysql.com
67087e2aa7
Patch for push of wl1354 Partitioning
2005-07-18 13:31:02 +02:00
konstantin@mysql.com
8b0adacbc6
After-merge fixes (4.1 -> 5.0).
2005-07-16 16:10:42 +04:00
konstantin@mysql.com
8e72214d74
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/media/sda1/mysql/mysql-5.0-merge
2005-07-16 13:45:32 +04:00
konstantin@mysql.com
e08caeeee2
A fix and a test case for Bug#9359 "Prepared statements take snapshot
...
of system vars at PREPARE time": implement a special Item
to handle system variables. This item substitutes itself with
a basic constant containing variable value at fix_fields.
2005-07-16 03:29:13 +04:00
tomas@poseidon.ndb.mysql.com
911d878ca9
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-15 15:08:38 +02:00
konstantin@mysql.com
374b9182af
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-4.1-11458
2005-07-13 17:39:48 +04:00
konstantin@mysql.com
bef558b7ee
- a fix for Bug#11458 "Prepared statement with subselects return random
...
data": remove the fix for another bug (8807) that
added OUTER_REF_TABLE_BIT to all subqueries that used a placeholder
to prevent their evaluation at prepare. As this bit hanged in
Item_subselect::used_tables_cache for ever, a constant subquery with
a placeholder was never evaluated as such, which caused wrong
choice of the execution plan for the statement.
- to fix Bug#8807 backport a better fix from 5.0
- post-review fixes.
2005-07-13 17:38:55 +04:00
tomas@poseidon.ndb.mysql.com
1affa6182a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-13 13:11:51 +02:00
dlenev@mysql.com
8a28d604f5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
2005-07-13 15:08:13 +04:00
dlenev@mysql.com
f334ea1fc6
Implementation of Monty's idea: Now we can open mysql.proc table for lookup
...
of stored routines definitions even if we already have some tables open and
locked. To avoid deadlocks in this case we have to put certain restrictions
on locking of mysql.proc table.
This allows to use stored routines safely under LOCK TABLES without explicitly
mentioning mysql.proc in the list of locked tables. It also fixes bug #11554
"Server crashes on statement indirectly using non-cached function".
2005-07-13 13:48:13 +04:00
lars@mysql.com
6db2602ad0
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/mysql-5.0
2005-07-13 02:13:04 +02:00
tomas@poseidon.ndb.mysql.com
1104d4c562
post merge fixes
2005-07-13 01:25:36 +02:00
tomas@poseidon.ndb.mysql.com
674b6bb151
Merge
2005-07-12 20:01:22 +02:00
jimw@mysql.com
de9909faec
Fix crash caused by calling DES_ENCRYPT() without the --des-key-file
...
option having been passed to the server. (Bug #11643 )
2005-07-07 11:49:44 -07:00
monty@mysql.com
75ff7d8085
After merge fixes
...
Better fix for ON DUPLICATE KEY UPDATE
2005-07-04 03:24:25 +03:00
monty@mysql.com
86d7b02199
Merge with 4.1
2005-07-03 14:17:52 +03:00
bell@sanja.is.com.ua
2941da3971
do not register changes of stack variable
2005-07-03 00:51:02 +03:00
bell@sanja.is.com.ua
d3905f3d0e
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
ramil@mysql.com
2eea2f5208
a fix.
...
bug #10617 : Insert from same table to same table give incorrect result for bit(4) column.
bug #11091 : union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
bug #11572 : MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
2005-06-30 13:38:29 +05:00
monty@mishka.local
83f90e060e
Better bug fix for:
...
#9728 'Decreased functionality in "on duplicate key update
#8147 'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE'
This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part
2005-06-27 16:46:41 +03: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
07b4a42e18
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-18 09:21:50 +02:00
acurtis@xiphis.org
07892fe219
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into xiphis.org:/usr/home/antony/work2/p3-bug6877.3
2005-06-17 22:32:46 +01:00
acurtis@xiphis.org
51dd521dfc
Bug#6877 MySQL should give an error if the requested table type is not available
...
Implement new SQL mode - NO_ENGINE_SUBSTITUTION
2005-06-17 22:14:44 +01: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
b3d977df10
Rename all prepared statements COM_ commands to prefix with COM_STMT_
2005-06-17 23:26:25 +04: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
dcb0e65dcb
Fix Bug#9334 "PS API queries in log file" and
...
Bug#8367 "low log doesn't gives complete information about prepared
statements"
Implement status variables for prepared statements commands (a port of
the patch by Andrey Hristov).
See details in comments to the changed files.
No test case as there is no way to test slow log/general log in
mysqltest.
2005-06-17 00:11:48 +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
joreland@mysql.com
84a04b4a9d
merge
2005-06-13 14:09:09 +02:00
joreland@mysql.com
54cff2bc30
merge
2005-06-13 08:05:29 +02:00
serg@serg.mylan
601979f0a8
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-09 20:02:06 +02:00