acurtis@xiphis.org
597b7412c7
fix after merge
2005-08-11 18:42:22 +01:00
jimw@mysql.com
2da798c991
Update test results
2005-08-04 14:38:48 -07:00
jimw@mysql.com
fa94e5389a
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-04 12:49:23 -07:00
jimw@mysql.com
b9da417688
Update test to deal with more relaxed datetime parsing.
2005-08-04 12:45:32 -07:00
hf@deer.(none)
293cfafd37
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-08-04 16:36:14 +05:00
hf@deer.(none)
c396a32f46
Fix for bug #9508 (query_cache test fails)
...
notembedded-specific part moved to the new test
2005-07-29 17:14:21 +05:00
bell@sanja.is.com.ua
f5833989ba
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-07-23 07:55:07 +03:00
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
jimw@mysql.com
ac8f9d3864
Fix test cases
2005-07-05 15:19:04 -07:00
bell@sanja.is.com.ua
2e96c47a82
post-merge fixes
2005-07-05 12:23:13 +03:00
bell@sanja.is.com.ua
15d02e60e1
merge
2005-07-05 11:38:05 +03:00
bell@sanja.is.com.ua
54662b4487
merge
2005-07-04 01:36:06 +03:00
bell@sanja.is.com.ua
b49b5805eb
abort storing query to query cache if warnings appeared (BUG#9414)
2005-06-28 00:52:21 +03:00
bell@sanja.is.com.ua
28a93877ca
temporary tables of subquery in the from clause just skipped during processing QC tables (BUG#11522)
2005-06-23 20:06:35 +03:00
bell@sanja.is.com.ua
a78cc26947
prohibit opening Query cache for SP cursors (BUG#9715)
2005-06-14 22:45:48 +03:00
jimw@mysql.com
395e51a0ef
Update test results
2005-05-02 11:45:06 -07:00
jimw@mysql.com
7bab94f36b
Clean up merge from 4.1
2005-05-02 10:19:37 -07:00
jimw@mysql.com
78ff49437f
Manually resolve merge
2005-04-29 08:46:03 -07:00
reggie@mdk10.(none)
4bb4a285ab
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-04-11 09:29:49 -05:00
dlenev@mysql.com
b0dd388190
Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796
...
into mysql.com:/home/dlenev/src/mysql-4.1-merges
2005-04-11 09:53:54 +04:00
dlenev@mysql.com
06e3647274
Fix for bug #9796 "Query Cache caches queries with CURRENT_USER()
...
function".
We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.
2005-04-11 00:30:23 +04:00
jimw@mysql.com
1476213e52
Fix crash in embedded server due to incorrect storage of results
...
in the query cache. (Bug #9549 )
2005-03-31 19:17:45 -08:00
jimw@mysql.com
f463143158
Update tests and test results after merge, disable broken NDB tests
2005-03-11 15:06:03 -08:00
jimw@mysql.com
eaea82d3af
Merge query_cache tests
2005-03-11 12:38:38 -08:00
jimw@mysql.com
50f9fc3368
Merge test and results
2005-03-11 11:07:32 -08:00
jimw@mysql.com
df84c534dd
Flush entries from the query cache for tables used in
...
administrative statements that may alter the table, such
as REPAIR TABLE. (Bug #8480 )
2005-03-07 18:15:19 -08:00
gluh@gluh.mysql.r18.ru
50266af38c
wl#1629 SHOW with WHERE(final part, after review)
...
added syntax:
'show variables where', 'show status where', 'show open tables where'
2004-12-30 15:20:40 +03:00
monty@mysql.com
47bbf768d4
Fixes after merge with 4.1
...
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
2004-11-03 12:39:38 +02:00
monty@mysql.com
afbe601302
merge with 4.1
2004-10-29 19:26:52 +03:00
monty@mysql.com
3493f54a5e
Merge with 4.0
2004-10-27 19:52:41 +03:00
bell@sanja.is.com.ua
ded12c828d
Check of temporary tables hiding for query fetched from QC (BUG#6084)
2004-10-21 23:56:12 +03:00
ram@gw.mysql.r18.ru
5f857a7a82
Blob support for the group_concat() function.
...
(Bug #4315 : GROUP_CONCAT with ORDER BY returns strange results for TEXT fields
Bug #5564 : Strange behaviour with group_concat and distinct
Bug #5970 : group_concat doesn't print warnings)
2004-10-10 12:10:53 +05:00
bell@sanja.is.com.ua
24e1464d5a
information about different variables agged to query cache (BUG#5515, BUG#5394)
2004-09-10 16:28:18 +03:00
bell@sanja.is.com.ua
1e3f10a4b1
mark subquery in the FROM clause like derived and quoate all identifiers (BUG#4609)
2004-07-20 08:48:28 +03:00
monty@mysql.com
1e31199995
Merge with 4.1.3-beta
2004-07-07 11:29:39 +03:00
paul@kite-hub.kitebird.com
f4dbb250fd
Language/consistency edits to error messages
...
and affected test results.
2004-06-15 15:38:36 -05:00
pem@mysql.com
71eddc362e
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
bell@sanja.is.com.ua
4c774e0c18
fixed flags of printed query
2004-05-13 23:47:20 +03:00
pem@mysql.comhem.se
d42b145817
Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc
...
merged manually by guilhem.
2004-04-28 12:08:54 +02:00
pem@mysql.com
dfd59e296e
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
bell@sanja.is.com.ua
e3a619f005
null processing for character_set_results (BUG#3296)
2004-03-30 23:38:56 +03:00
pem@mysql.comhem.se
6395822932
Fixed BUG#3117: LAST_INSERT_ID() works incorrectly inside stored procedure.
...
This turned out to be a problem for prepared statements as well; the id was
evaluated once, at parse time.
2004-03-25 17:42:13 +01:00
monty@mysql.com
f34a642d6e
after merge fixes
2004-03-18 00:09:13 +02:00
monty@mysql.com
350b433569
merge with 4.0
2004-03-16 22:41:30 +02:00
bell@sanja.is.com.ua
d03034d306
invalidation of locking for write tables (BUG#2693)
...
fixed linking query_prealloc_size to query cache presence
2004-03-04 18:32:55 +02:00
monty@mysql.com
f43093ec0e
After merge fixes
...
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
2004-02-16 10:03:25 +02:00
pem@mysql.comhem.se
f9e73c7716
Post-merge fixes.
2004-02-11 18:21:55 +01:00
pem@mysql.com
c8585f3283
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
monty@mysql.com
06432eac36
Added --compact to mysqlbinlog
...
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned
2004-02-09 12:31:03 +01:00
bell@sanja.is.com.ua
41323e8b76
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-drop-4.1
2004-01-17 10:02:01 +02:00