Commit graph

196 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
e9492cca05 avoid using ndb tables in query cache 2004-05-05 11:22:10 +03:00
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
monty@mysql.com
42cf92ce37 Fixed many compiler warnings
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695, #3381 and #3319)
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly
2004-04-05 13:56:05 +03:00
bell@sanja.is.com.ua
e3a619f005 null processing for character_set_results (BUG#3296) 2004-03-30 23:38:56 +03:00
bell@sanja.is.com.ua
54d5f4ae8f query cache statistic fixed 2004-03-30 18:47:04 +03:00
monty@mysql.com
4bc6b551f8 false/true -> FALSE/TRUE
Fixes after last merge
2004-03-30 02:32:41 +03:00
monty@mysql.com
dc2f606fb8 Merge with 4.0 to get lastest bug fixes 2004-03-29 19:21:53 +03:00
bell@sanja.is.com.ua
bbb6642a66 aliases should be compared with my_strcasecmp (BUG#3251)
some db comparison code cleupup
removed compiler warnings
2004-03-22 15:43:13 +02:00
bell@sanja.is.com.ua
b0722aad12 fixed BUG in query cahe statistic counting 2004-03-21 11:48:51 +02:00
monty@mysql.com
53c810cda4 merge fixes (use old code) 2004-03-18 00:16:04 +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
bell@sanja.is.com.ua
0af6983ed0 fixed comparation of tables/database names with --lower_case_table_names (BUG#2880) 2004-02-20 22:44:54 +02:00
pem@mysql.com
c8585f3283 Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
hf@deer.(none)
2e7a5d3e74 SCRUM
WL#1246 (Query cache in embedded library)
Some fixes after testing
2004-01-07 16:41:09 +04:00
hf@deer.(none)
73012f0db2 Merge 2004-01-07 12:54:28 +04:00
pem@mysql.com
12187684ca Merging lex-pointer change from 4.1 to 5.0. 2003-12-19 20:13:48 +01:00
konstantin@oak.local
d37da004f6 THD::lex now points to THD::main_lex like in 5.0
All tests pass (client_test included)
2003-12-19 20:52:13 +03: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
monty@mysql.com
cfeec4f58e Add cast to remove compiler warning 2003-12-10 12:03:54 +02:00
hf@deer.(none)
afd0b37816 SCRUM
WL#1246 (Query cache in embedded library)
2003-12-01 17:19:10 +04: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
bell@sanja.is.com.ua
8a41df536c fixed layout 2003-11-07 13:02:52 +02:00
monty@narttu.mysql.fi
4e4725377d Merge with 4.0 2003-11-04 09:40:36 +02:00
pem@mysql.com
337238b78a Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
heikki@hundin.mysql.fi
6112853cda Many files:
Multiple tablespaces for InnoDB
sql_table.cc:
  Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
sql_update.cc, sql_select.cc, my_base.h:
  More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
2003-10-07 17:28:59 +03:00
bar@bar.mysql.r18.ru
67347790de sql_cache.cc, mysql_priv.h:
Query cache now takes in account character_set_results and collation_connection
2003-10-03 17:09:54 +05:00
bell@laptop.sanja.is.com.ua
d360ddc0b2 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc_struct-4.1
2003-10-02 12:18:34 +03:00
bell@laptop.sanja.is.com.ua
c3ab43b3f0 Structure for storing parameters of query in query cache (asked by Bar) 2003-10-02 12:02:05 +03:00
hf@deer.(none)
5f8e7fef27 Merge 2003-09-26 15:40:26 +05:00
hf@deer.(none)
ba8fa76fa2 SCRUM:
WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server
2003-09-26 15:33:13 +05:00
pem@mysql.telia.com
6e55a3428a Post-merge fixes. 2003-09-24 15:26:20 +02:00
pem@mysql.com
8d884c02bb Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
hf@deer.(none)
a2dbfaefa3 SCRUM
embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?
2003-09-19 14:44:31 +05: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
bell@laptop.sanja.is.com.ua
7a86c7df28 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2003-08-26 16:42:49 +03:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
bell@sanja.is.com.ua
6250e76381 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2003-08-12 23:45:53 +03:00
bell@sanja.is.com.ua
57bb575d49 fixed query cache intercommunication with innodb engine 2003-08-12 23:45:04 +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
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
pem@mysql.telia.com
a8a29a39d2 Merging 4.1 into 5.0 (second pass; post-merge fixes).
One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(
2003-07-09 17:07:12 +02:00
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00
monty@narttu.mysql.fi
a3fe7c0959 Remove compiler warnings
Simple cleanup of previous pull
2003-07-04 23:06:19 +03:00
monty@narttu.mysql.fi
40109c574a Merge with 4.0.13 2003-06-04 19:21:51 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
2003-06-04 18:28: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
vva@eagle.mysql.r18.ru
afd581edd3 made lex a pointer in THD 2003-05-05 14:54:37 -04:00
pem@mysql.com
35c82164f6 Merged 4.1 to 5.0. 2003-04-29 12:06:04 +02:00
bell@sanja.is.com.ua
12181f6f6e fixed bug in processing transaction in query cache (inserted lost lines) 2003-04-20 22:18:32 +03:00
pem@mysql.com
64da2fff67 Post post-merge fix. 2003-04-17 00:34:15 +02:00
bell@sanja.is.com.ua
5ea922aab0 merging 2003-04-16 20:35:29 +03:00
hf@deer.mysql.r18.ru
5d4e9f95f2 Merging 2003-04-08 19:43:24 +05:00
mysql@home.(none)
6a948b8363 sql_cache.cc:
Cast to unsigned char
2003-04-05 07:59:10 +05:00
bar@bar.mysql.r18.ru
688aaf4152 sql_cache.cc:
Windows compilation fix
2003-04-03 14:52:12 +05:00
hf@genie.(none)
0ee0589e93 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into genie.(none):/home/hf/work/mysql-5.0.kil
2003-03-31 13:42:37 +05:00
hf@genie.(none)
f8f0b70380 SCRUM
two KILL commands implementation (version 2)
2003-03-31 13:39:46 +05: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
bar@bar.mysql.r18.ru
8103c4c537 CONVERT class was removed 2003-03-18 17:01:32 +04:00
bell@sanja.is.com.ua
b2f27a155c made variable query_cache_min_res_unit from QUERY_CACHE_MIN_RESULT_DATA_SIZE (SCRUM) 2003-03-02 21:39:03 +02:00
bell@sanja.is.com.ua
4352b9953a fixed SQL_SELECT option with UNIONs 2003-02-27 22:26:09 +02:00
bell@sanja.is.com.ua
1de8a5996f Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-qc-4.1
2003-02-18 16:28:31 +02:00
bell@sanja.is.com.ua
316097e17b aftermerging fix 2003-02-18 16:27:04 +02:00
monty@mashka.mysql.fi
e327393e9d Fixed a lot of wrong memory references as reported by valgrind
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
2003-02-12 21:55:37 +02:00
bell@sanja.is.com.ua
7467708611 fixed compiler error 2003-01-29 21:17:46 +02:00
monty@mashka.mysql.fi
7436e9ec97 Merge 2003-01-21 21:28:51 +02:00
monty@mashka.mysql.fi
25c393a12e Portability fixes (for windows)
Some changes to the prepared statement protocol to make it easier to use and faster.
2003-01-21 21:07:59 +02:00
hf@deer.mysql.r18.ru
389680e04e Conflicts resolving 2003-01-20 18:59:45 +04:00
hf@deer.mysql.r18.ru
1f6b615677 SCRUM
embedded-related changes
2003-01-20 18:47:25 +04:00
bell@sanja.is.com.ua
1dde85db7c using internal name conversion in query cache as it was suggested by Shurik 2003-01-17 15:36:08 +02:00
hf@deer.mysql.r18.ru
96089e2b3a resolving conflicts 2003-01-15 13:15:35 +04:00
Sinisa@sinisa.nasamreza.org
5988ae5ca5 Many fixes.
I still have to make a test case for :

UPDATE from sub-select with derived table
2002-12-24 13:58:07 +02:00
hf@deer.mysql.r18.ru
e3b3b68307 Big purge about embedded library (scrum) 2002-12-16 17:33:29 +04:00
bell@sanja.is.com.ua
3103bca9b2 merging 2002-12-11 19:53:57 +02:00
pem@mysql.com
ae2192ed53 Moved safe_to_cache_query from thd to lex.
This is required for prepared statements and stored procedures.
2002-11-22 14:50:53 +01:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
bell@sanja.is.com.ua
64047ea9a7 new status variable (number of queries deleted because of low memory) 2002-11-17 20:41:25 +02:00
monty@butch.
a2bdf9265f Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. 2002-11-07 03:54:00 +02:00
bell@sanja.is.com.ua
d939f36e47 Fix to make working new innodb query cache beahaviour
Fix grammar
Fix debuging methods to be workable with switched off query cache
(2Heikki: it is for you)
2002-11-06 21:26:27 +02:00
bell@sanja.is.com.ua
8180bfe78d Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-qc-4.1
2002-11-06 10:51:05 +02:00
bell@sanja.is.com.ua
4307363079 new innodb query cache behaviour (recommit because of problem with 4.1 repository pushing)
fixed bug in quqry cache dbd transaction processing
2002-11-03 10:15:14 +02:00
bell@sanja.is.com.ua
1f20cf3b42 removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM)
fixed some possible bugs
2002-10-30 13:18:52 +02:00
serg@serg.mysql.com
784aeed98b bad merge fixed 2002-10-14 11:55:28 +00:00
serg@serg.mysql.com
fcb8bc061d merged 2002-10-14 11:36:48 +00:00
bell@sanja.is.com.ua
8d252004dc fixed query cache with system database
FN_NO_CASE_SENCE used instead of __WIN__ in table name handling of quary cache
2002-10-08 00:26:15 +03:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
a748b35ddd merge with work 2002-10-02 13:45:16 +03:00
monty@mashka.mysql.fi
cb8580a2cd Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
This should fix some issues where --lower-case-table-names doesn't work properly under windows.
2002-09-20 14:05:18 +03:00
bell@sanja.is.com.ua
96ebe3816f new function for innodb
windows case insensitive tables name work around
2002-09-19 10:36:19 +03:00
bell@sanja.is.com.ua
89a6185dd3 query cache TODO 2002-09-04 09:40:01 +03:00
monty@narttu.mysql.fi
7134ffec21 Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
monty@hundin.mysql.fi
7dac7062fa Changed relay_log_space to ulonglong
Removed compiler warnings.
2002-08-23 15:14:01 +03:00
monty@mashka.mysql.fi
1bb7665a9c merge 2002-08-08 03:29:36 +03:00
monty@mashka.mysql.fi
2c4fa340cc Lots of code fixes to the replication code (especially the binary logging and index log file handling)
Fixed bugs in my last changeset that made MySQL hard to compile.
Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables.
Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions
Extended my_chsize() to allow one to specify a filler character.
Extend vio_blocking to return the old state (This made some usage of this function much simpler)
Added testing for some functions that they caller have got the required mutexes before calling the function.
Use setrlimit() to ensure that we can write core file if one specifies --core-file.
Added --slave-compressed-protocol
Made 2 the minimum length for ft_min_word_len
Added variables foreign_key_checks & unique_checks.
Less logging from replication code (if not started with --log-warnings)
Changed that SHOW INNODB STATUS requre the SUPER privilege
More DBUG statements and a lot of new code comments
2002-08-08 03:12:02 +03:00
bell@sanja.is.com.ua
011fed6059 Fixed bug in query cache after temporary table creation. 2002-08-07 15:29:49 +03:00