Commit graph

175 commits

Author SHA1 Message Date
dkatz@damien-katzs-computer.local
7a303bc80e Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/mysql51
2007-06-13 16:37:16 -04:00
dkatz@damien-katzs-computer.local
1481bfc87b Bug #28897 UUID() returns non-unique values when query cache is enabled
Removed the ability to cache queries containing "UUID()".
2007-06-13 14:23:25 -04:00
thek@adventure.(none)
902b02ec0b Corrected test case for 5.1 requirements 2007-05-08 11:56:47 +02:00
thek@adventure.(none)
6927ddd85a Merge adventure.(none):/home/thek/Development/cpp/bug27792/my50-bug27792
into  adventure.(none):/home/thek/Development/cpp/bug27792/my51-bug27792
2007-05-08 11:29:07 +02:00
thek@adventure.(none)
5e774747bc 4.1 -> 5.0 Manual merge for Bug #27792 2007-05-08 11:24:07 +02:00
kostja@bodhi.local
bdb10baec1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-03-20 00:42:11 +03:00
guilhem@gbichot3.local
eaf7728d9f Fix for BUG#735 "Prepared Statements: there is no support for Query
Cache".
WL#1569 "Prepared Statements: implement support of Query Cache".
Prepared SELECTs did not look up in the query cache, and their results
were not stored in the query cache. This made them slower than
non-prepared SELECTs in some cases.
The fix is to re-use the expanded query (the prepared query where
"?" placeholders are replaced by their values, at execution time)
for searching/storing in the query cache.
It works fine for statements prepared via mysql_stmt_prepare(), which
are the most commonly used and were the scope of this bugfix and WL.
It works less fine for statements prepared via the SQL command
PREPARE...FROM, which are still not using the query cache if they
have at least one parameter (because then the expanded query contains
names of user variables, and user variables don't work with the
query cache, even in non-prepared queries).
Note that results from prepared SELECTs, which are in the binary
protocol, and results from normal SELECTs, which are in the text
protocol, ignore each other in the query cache, because a result in the
binary protocol should never be served to a SELECT expecting the text
protocol and vice-versa.
Note, after this patch, bug 25843 starts applying to query cache
("changing default database between PREPARE and EXECUTE of statement
breaks binlog"), we need to fix it.
2007-03-09 18:09:57 +01:00
msvensson@pilot.mysql.com
b6f78aa153 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-14 14:51:49 +01:00
msvensson@pilot.mysql.com
45fe5879f4 Bug#18628 mysql-test-run: security problem(part1)
- Implement --secure-file-priv=<dir> option that limits
  "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
  with files in specified dir.
 - Use above option for mysqld in mysql-test-run.pl
2007-02-14 14:44:34 +01:00
msvensson@shellback.(none)
7ddc43e305 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-29 15:44:09 +01:00
holyfoot/hf@deer.(none)
989117071a Merge mysql.com:/home/hf/work/mysql-5.0-0mrg
into  mysql.com:/home/hf/work/mysql-5.1-mrg
2006-11-19 22:26:36 +04:00
tnurnberg@salvation.intern.azundris.com
655056d32f Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
Fix tests for new behaviour: an error is thrown if a NON DETERMINISTIC
stored function (SF) is called during statement-based replication (SBR).
2006-11-17 21:30:28 +01:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/mysql-5.0-0mrg
2006-11-17 10:30:16 +04:00
evgen@moonbone.local
5198354584 Bug#20045: Server crash on INSERT ... SELECT ... FROM non-mergeable view
The regression is caused by the fix for bug 14767. When INSERT ... SELECT
used a view in the SELECT list that was not inlined, and there was an 
active transaction, the server could crash in Query_cache::invalidate.

On INSERT ... SELECT only the table being inserted into is invalidated.
Thus views that can't be inlined are skipped from invalidation.

The bug manifests itself in two ways so there is 2 test cases.
One checks that the only the table being inserted into is invalidated.
And the second one checks that there is no crash on INSERT ... SELECT.
2006-11-14 19:50:44 +03:00
msvensson@neptunus.(none)
f39ff057d1 Update tests and result files after running with new mysqltest that better detects problems with test files 2006-10-04 13:09:37 +02:00
msvensson@shellback.(none)
3d2e366be1 Add missing semicolon in query_cache test 2006-07-29 12:35:30 +02:00
monty@mysql.com
be269e56d2 SHOW STATUS does not anymore change local status variables (except com_show_status). Global status variables are still updated.
SHOW STATUS are not anymore put in slow query log because of no index usage.

Implemntation done by removing orig_sql_command and moving logic of SHOW STATUS to mysql_excute_command()
This simplifies code and allows us to remove some if statements all over the code.

Upgraded uc_update_queries[] to sql_command_flags and added more bitmaps to better categorize commands.
This allowed some overall simplifaction when testing sql_command.

Fixes bugs:
Bug#10210: running SHOW STATUS increments counters it shouldn't
Bug#19764: SHOW commands end up in the slow log as table scans
2006-06-20 13:20:32 +03:00
elliot@mysql.com
c0b5b3cd40 Fix spelling in comments as requested by Osku
This will make charset code easier to understand
2006-05-02 09:13:58 -04:00
monty@mysql.com
e3796c924f After merge fixes 2006-02-26 15:11:56 +02:00
monty@mysql.com
82b77cdd90 Fixes to embedded server to be able to run tests with it
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02:00
msvensson@neptunus.(none)
3f1cf9fabc Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 17:57:26 +01:00
msvensson@neptunus.(none)
809deba6e5 Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
2006-02-07 17:20:50 +01:00
msvensson@neptunus.(none)
9304785c10 Add new option "check-testcases" to mysql-test-run.pl
Cleanup the sideeffects from most of the  testcases with sideeffects.
2006-01-26 17:54:34 +01:00
msvensson@neptunus.(none)
09ec2919a1 Make it possible to run mysql-test-run.pl with default test suite in different vardir. 2006-01-24 08:30:54 +01:00
holyfoot@deer.(none)
e8697cf428 Big patch to make embedded-server working in 5.x
Now it supports queries returning several results
(particularly important with the SP)
2006-01-04 14:20:28 +04:00
bell@sanja.is.com.ua
3d2d9c2259 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
2005-12-03 08:56:00 +02:00
evgen@moonbone.local
f2559fbcc3 Merge moonbone.local:/work/15028-bug-5.0-mysql
into moonbone.local:/work/15028-bug-5.1-new-mysql
2005-12-02 22:07:10 +03:00
bell@sanja.is.com.ua
54b7e6e3dc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-02 20:50:54 +02:00
evgen@moonbone.local
00b902b065 Manually merged 2005-12-02 19:42:14 +03:00
bell@sanja.is.com.ua
7796a79477 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 14:38:29 +02:00
bell@sanja.is.com.ua
12d1bf1231 We should skip beggining '(' characters when test query on possibility
to be in the query cache. (BUG#14652)
2005-12-01 14:26:19 +02:00
monty@mysql.com
e42c980967 Table definition cache, part 2
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
  object and open a handler to the table object

Other noteworthy changes:
- In TABLE_SHARE the most common strings are now LEX_STRING's
- Better error message when table is not found
- Variable table_cache is now renamed 'table_open_cache'
- New variable 'table_definition_cache' that is the number of table defintions that will be cached
- strxnmov() calls are now fixed to avoid overflows
- strxnmov() will now always add one end \0 to result
- engine objects are now created with a TABLE_SHARE object instead of a TABLE object.
- After creating a field object one must call field->init(table) before using it

- For a busy system this change will give you:
 - Less memory usage for table object
 - Faster opening of tables (if it's has been in use or is in table definition cache)
 - Allow you to cache many table definitions objects
 - Faster drop of table
2005-11-23 22:45:02 +02:00
ramil@mysql.com
de26178f75 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b10303
2005-10-24 11:36:29 +05:00
msvensson@neptunus.(none)
9b7a3bec70 Bug #13231 mysqltest: fails to dectect when mysql_next_result fails
- Packets out of order when reading cached data stored by a normal select from a ps or vice versa.
 - Add pkt_nr to query cache flags
2005-09-29 10:25:44 +02:00
ramil@mysql.com
68acf8fdea fix (bug #10303: Misleading Last_query_cost value). 2005-09-06 15:00:35 +05: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
monty@mysql.com
15d48525af Merge mysql.com:/home/my/mysql-4.1
into  mysql.com:/home/my/mysql-5.0
2005-07-28 17:09:54 +03:00
monty@mysql.com
3c12d0ae54 Added end marker for tests to make future merges easier 2005-07-28 03:22:47 +03: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
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
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
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
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
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
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
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
pem@mysql.com
99e0ae85c7 Merge 4.1 to 5.0. 2003-12-19 18:03:27 +01:00
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00
pem@mysql.com
975061bb5a Merge 4.1 to 5.0. 2003-12-16 16:12:28 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
fcf96dbb18 WorkLog#1323
Deprecate the use of TYPE=... Preferred syntax is ENGINE=
2003-12-10 04:31:42 +00:00
bell@sanja.is.com.ua
ccb07a4fbb fixed length of current database name if it is dropped (BUG#1986) 2003-12-04 23:57:10 +02:00
bell@sanja.is.com.ua
a1ceb1bd04 database invalidation invalidate queries only of given database (BUG#1898) 2003-11-20 18:12:49 +02:00
pem@mysql.com
28a2c6a96b Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
monty@narttu.mysql.fi
4e4725377d Merge with 4.0 2003-11-04 09:40:36 +02:00
bell@sanja.is.com.ua
33346e26af added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()
added string length for more speed
made code covarage for print() method of Item
fixed printability of some items (SCRUM) (WL#1274)
2003-10-30 12:57:26 +02:00
pem@mysql.com
337238b78a Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
bar@bar.mysql.r18.ru
9023009ae3 query_cache.result, query_cache.test:
Character set variables test
2003-10-08 10:18:38 +05:00
pem@mysql.com
8d884c02bb Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
bell@sanja.is.com.ua
702b5ad4d6 fixed server crash on moving query block with pointers to same table in it (BUG#988)
removed server options
2003-09-15 15:16:13 +03:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
monty@narttu.mysql.fi
efa85aad49 Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files. 2003-08-22 04:07:40 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
bell@sanja.is.com.ua
ddd3ee8b27 rewritten test using loop (BUG#930)
removed unused field (now it is in variables)
2003-08-08 23:27:22 +03:00
bell@sanja.is.com.ua
86e6cf399e support of more then 255 tables dependence in query cache (fixed BUG#930) 2003-07-30 14:59:56 +03:00
bell@sanja.is.com.ua
376f026550 tabe & query hashes made case insensitive (BUG#933) 2003-07-28 18:28:44 +03:00
bell@sanja.is.com.ua
19efafcc13 allow to look up queries with leading comments 2003-07-18 16:34:50 +03:00
monty@narttu.mysql.fi
c21728f8c8 Cleaner implementation if INSERT ... SELECT with same tables
Tests cleanup (put drop database first in tests)
2003-07-03 11:55:36 +03:00
monty@narttu.mysql.fi
40109c574a Merge with 4.0.13 2003-06-04 19:21:51 +03:00
bell@sanja.is.com.ua
2848e6c0d4 fixed bug 549 - incorect query cache memory formating on very small query cache sizes 2003-05-31 01:41:11 +03:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
bell@sanja.is.com.ua
4d87fd0346 fixed bug 209 (SQL_SELECT_LIMIT and query cache incompatibility) 2003-03-31 09:49:09 +03:00
bell@sanja.is.com.ua
e4bc744d9b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qcvar-4.1
2003-03-28 16:18:26 +02:00
bell@sanja.is.com.ua
439ac36d52 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-4.0
2003-03-28 15:36:42 +02:00
monty@mashka.mysql.fi
7d09120105 After merge fixes 2003-03-27 14:15:42 +02:00
monty@mashka.mysql.fi
3bed7a6131 Merge with 4.0.13 2003-03-26 18:37:38 +02:00