jimw@mysql.com
ca56883011
Merge mysql.com:/home/jimw/my/mysql-4.1-9947
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:12:30 -07:00
jimw@mysql.com
9a5560683f
Merge mysql.com:/home/jimw/my/mysql-4.1-10724
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:10:35 -07:00
jimw@mysql.com
3409537f2a
Don't force column header to @@session.var_name if @@local.var_name
...
was used. (Bug #10724 )
2005-07-25 11:25:28 -07:00
hf@deer.(none)
ded44df2b5
Fix for bug #6710 (CREATE FUNCTION fails with 'Unknown error')
2005-07-23 17:21:27 +05:00
jimw@mysql.com
b4b874568b
Merge mysql.com:/home/jimw/my/mysql-4.1-9979
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 10:52:22 -07: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
monty@mysql.com
10c4678def
Move reset of insert_values to ensure it's done also during error conditions
...
This fixed a failure of insert_update.test on some platforms
2005-06-28 15:06:16 +03:00
jimw@mysql.com
d4dea98f44
Fix max_connections_per_hour handling when the global
...
max_user_connections is also set. (Bug #9947 )
2005-06-27 18:03:14 -07:00
monty@mishka.local
7398252d02
Portability fixes
...
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
2005-06-27 20:31:00 +03:00
monty@mishka.local
6db013ef86
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-06-27 16:47:44 +03: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
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
evgen@moonbone.local
2235ea9593
Fix bug #9728 decreased functionality in "on duplicate key update"
...
Remove changes made by bug fix #8147 . They strips list of insert_table_list to
only insert table, which results in error reported in bug #9728 .
Added flag to Item to resolve ambigous fields reported in bug #8147 .
2005-06-22 07:18:42 +04:00
elliot@mysql.com
a24336cdcb
BUG#10442 Minor changes from code review
2005-06-21 15:40:58 -04:00
jimw@mysql.com
ec54dcb054
Fix spurious permissions problem when CONVERT_TZ() is used
...
in a multi-table update query. (Bug #9979 )
2005-06-17 08:56:04 -07:00
elliot@mysql.com
0c71508759
BUG#10442 Fix replication slave crash when a query with multiupdate and
...
subselects is used.
2005-06-17 11:15:29 -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
lars@mysql.com
630dd9a0b7
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b6883-mysql-4.1
2005-06-07 11:54:31 +02:00
lars@mysql.com
cd2fbb01c4
BUG#6883: Changed comment, style
2005-06-07 11:47:59 +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
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
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
c420599581
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
Hand merged from 4.0.
2005-05-31 19:37:24 +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
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
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
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
jimw@mysql.com
9c33716380
Clean up error message for connections-per-hour user limit
...
being exceeded. (Bug #9947 )
2005-04-27 17:05:15 -07:00
jimw@mysql.com
623a5d5a57
Clean up merge of fix for Bug #9468 .
2005-04-01 19:00:14 -08:00
bell@sanja.is.com.ua
c64efa6062
merge
2005-03-30 22:11:08 +03:00
serg@serg.mylan
9db4daf111
merged
2005-03-30 10:52:28 +02:00
serg@serg.mylan
2a297353c6
don't strcmp db if it's a pattern
2005-03-30 10:43:24 +02:00
bell@sanja.is.com.ua
dcdda90a11
Merge
2005-03-30 10:27:36 +03:00
serg@serg.mylan
72c9ac844b
fixes for "backport wild_compare fix from 4.1 - bug#3924"
2005-03-26 19:46:42 +01:00
msvensson@neptunus.(none)
bf2f6ff2d4
BUG#9303 blob field with specified length < 256 does not create tinyblob
2005-03-24 13:48:38 +01:00
bell@sanja.is.com.ua
4554b1f263
fixed union types merging and table related metadata (BUG#8824)
2005-03-23 08:36:48 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9ec8d87328
Updated error message to be more informative. Previous error message
...
"Access denied to database mysql" was actually not just misleading, but
also wrong.
Bug#7905.
2005-03-14 16:59:09 +02:00
jimw@mysql.com
df3c8db4f3
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:14:49 -08:00
konstantin@mysql.com
b902a66e27
Fix -ansi -pedantic compilation failure.
2005-02-21 17:27:36 +03:00
jimw@mysql.com
10800c1eb5
Merge mysql.com:/home/jimw/my/mysql-4.1-8475
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-18 15:40:17 -08:00
jimw@mysql.com
29d1d9a369
Clean up merge for fix for Bug #8350 .
2005-02-18 15:23:17 -08:00
jimw@mysql.com
1c22de9032
Log each slow query in a multi-statement query to the slow query log.
...
(Bug #8475 )
2005-02-17 11:48:44 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
10ab9e982f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1
2005-02-17 17:52:49 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
a1bf1c926e
Bug#8147
...
Fix ambigious table error for INSERT..SELECT..UPDATE
2005-02-17 01:33:59 +00:00
guilhem@mysql.com
4f41de1cc5
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-15 15:12:50 +01:00