pem@mysql.com
71eddc362e
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
dlenev@brandersnatch.localdomain
c095ce828e
Fix for bug which caused grant.test fail on darwin7.3. We were converting db and table
...
names to lower case using latin1 instead of utf-8 in sql_acl.cc if lower_case_table_names
was on. Also replaced in other such places system_charset_info with files_charset_info
for consistency.
2004-05-22 23:41:58 +04:00
pem@mysql.com
bf45960eef
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
pem@mysql.comhem.se
d02d105916
Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms.
2004-05-06 19:55:12 +02:00
bell@sanja.is.com.ua
c5c35c667e
caching of queries with isammerge tables forbiden using general way
...
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update
2004-05-05 21:21:41 +03:00
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
