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
bell@sanja.is.com.ua
fd0989e76a
fixed query cahe resize bug
2002-07-28 22:36:34 +03:00
monty@mashka.mysql.fi
dddc20d9d1
New SET syntax & system variables.
...
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups
2002-07-23 18:31:22 +03:00
bell@sanja.is.com.ua
cc327c60c8
typo fixed
2002-06-30 13:00:36 +03:00
bell@sanja.is.com.ua
2426972c5b
semaphores replaced by rwlock
2002-06-30 12:08:58 +03:00
monty@hundin.mysql.fi
0d8e13979d
Made keyread (key scanning) a key specific attribute.
...
This avoids using fulltext keys for table scanning.
This also reverts Sinisa's original fix for this problem.
2002-06-19 00:22:30 +03:00
monty@mashka.mysql.fi
2aecdd1a91
Big code cleanup/review before 4.0.2 release.
...
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.
2002-06-11 11:20:31 +03:00
bell@sanja.is.com.ua
839d661b3c
removed unneeded table name pointer
...
transaction-live memory cleanup moved to ha_commit/ha_rollback
fixed query cache validator to work correctly on systems that allocate unaligned dat
2002-06-09 00:58:05 +03:00
bell@sanja.is.com.ua
1a69084465
Fixed query cache align data bug.
2002-06-07 00:02:50 +03:00
bell@sanja.is.com.ua
1937feaec3
fixing error
2002-06-06 19:46:27 +03:00
bell@sanja.is.com.ua
35068eef61
probably fix of alignment error in query cache
2002-06-06 19:21:07 +03:00
monty@hundin.mysql.fi
f0b28da6f9
merge with 4.0
2002-06-03 12:59:31 +03:00
monty@hundin.mysql.fi
e68ebac9db
Fixed some things to make MySQL to compile again.
2002-05-15 18:41:36 +03:00
miguel@hegel.local
dfd0b75f7f
Fix VC++ compiler error
2002-05-14 21:28:09 -03:00
monty@hundin.mysql.fi
b5a145d872
merge
2002-04-13 15:34:39 +03:00
bell@sanja.is.com.ua
c5d95b5e62
added building without query cache
2002-03-22 22:55:08 +02:00
bell@sanja.is.com.ua
63b2a551bf
processing trunsactional tables in query cache
2002-03-15 23:57:31 +02:00
bar@gw.udmsearch.izhnet.ru
c60a29f0ee
Hash now supports several charsets
2002-03-14 21:44:42 +04:00
bar@gw.udmsearch.izhnet.ru
b37ce8e769
New ctype functions/macros to support many charsets at a time
2002-03-12 21:37:58 +04:00
monty@hundin.mysql.fi
4000b036c0
Fixes for new getopt
...
Bug fix when using --no-deaults
Sets ref_length to right value (faster rnd_pos() handling in InnoDB).
Fixed problem with multi-table-delete and InnoDB
Fixed problem with truncate table, which required a COMMIT before.
Fixed multi-table-delete bug with InnoDB.
Remove not used index from EXPLAIN
2002-01-31 04:36:58 +02:00
monty@hundin.mysql.fi
be46289855
New error messages
...
Test of unsigned BIGINT values
Fixes for queries-per-hour
Cleanup of replication code (comments and portability fixes)
Make most of the binary log code 4G clean
Changed syntax for GRANT ... QUERIES PER HOUR
2002-01-29 18:32:16 +02:00
bell@sanja.is.com.ua
11920dbbe7
New result block allocation strategy
2002-01-12 15:40:52 +02:00
miguel@light.local
558d88f977
Win32 Embedded Server Changes
2002-01-09 05:38:48 -02:00
bell@sanja.is.com.ua
f9d091d16f
Typo fixing
2002-01-08 08:48:05 +02:00
bell@sanja.is.com.ua
7bef26f192
TODO reorganization
2002-01-08 08:38:33 +02:00
monty@hundin.mysql.fi
ff17389116
Fix for FLUSH QUERY CACHE
...
Fix for new bug in CREATE TABLE when sorting keys.
2002-01-05 22:51:42 +02:00
monty@hundin.mysql.fi
a9de2c14a0
Some small fixes to the query cache.
2002-01-03 19:04:01 +02:00
monty@hundin.mysql.fi
b0ea238d2e
merge
2002-01-02 22:02:03 +02:00
monty@hundin.mysql.fi
4b877e0088
Added macros for nice TIMESPEC usage.
...
Fixes for building MySQL with gcc 3.0
Added SIGNED / UNSIGNED casts
Fixed core dump bug in net_clear() with libmysqld.
Back to using semaphores in query cache.
Added 'Null' and 'Index_type' to SHOW INDEX.
2002-01-02 21:29:41 +02:00
bell@sanja.is.com.ua
dbf8f3c32f
fixing query cache validator
2002-01-02 17:55:10 +02:00
monty@hundin.mysql.fi
d2cae57402
Limit created keys to MAX_KEY_LENGTH.
...
Fix problem with query cache and database names
2001-12-23 02:43:46 +02:00
monty@hundin.mysql.fi
95a3bfac1d
Fix compiler warning
2001-12-22 19:08:57 +02:00
monty@hundin.mysql.fi
9e1ed2e4dc
Fixed access privilege bug in query cache.
...
Change tests to use database 'mysqltest' instead of 'foo'
Add option to not print access denied messages to check_table_access()
2001-12-22 15:13:31 +02:00
monty@hundin.mysql.fi
55a2ab6e7e
Cleanup of alarm macros.
...
Fixed data corruption bug in query cache.
Made queries be dependent of the database in use.
2001-12-21 07:00:58 +02:00
monty@hundin.mysql.fi
1a4ac20bf9
Fixed bug in FLUSH QUERY CACHE
...
Changed 'send_file_to_server' to use less stack (Fixed replication problem on OSF1).
2001-12-19 15:45:04 +02:00
monty@hundin.mysql.fi
b3fb88dc72
Don't use symlinks when using HAVE_purify.
...
Fix compile problem in sql_cache.cc
2001-12-17 04:16:10 +02:00
monty@hundin.mysql.fi
4dbd9e061c
Lots of portability fixes.
...
Fixed shutdown on HPUX.
Fixed bug in query cache.
2001-12-17 03:02:58 +02:00
monty@hundin.mysql.fi
61be9477ec
Removed not used functions from sql_cache
...
Added new tests to testsuite.
2001-12-14 16:02:41 +02:00
monty@hundin.mysql.fi
87fd219d67
Fixed sleep time in mysql-test-run
...
Fixed bug in query cache.
Cleaned up des_crypt code.
2001-12-13 02:31:19 +02:00
monty@hundin.mysql.fi
db2e22bf7e
Portability fixes.
...
Changed mysql-test-run.sh to test for files to get shorter, more reliable timeouts.
2001-12-10 18:16:51 +02:00
monty@hundin.mysql.fi
6b02f13cf3
Removed compiler warnings.
...
Added new operators to be used with gcc 3.0.x
Update of query cache code.
Added semaphores for Windows (not yet in use)
Added pthread_mutex_trylock for windows.
2001-12-10 00:08:24 +02:00
monty@hundin.mysql.fi
b658662ae4
Update copyright
...
Fixed memory leak on shutdown (Affects the embedded version & MyODBC)
2001-12-06 14:10:51 +02:00
monty@hundin.mysql.fi
4c17825acd
Update of query cache code
2001-12-06 01:05:30 +02:00
monty@hundin.mysql.fi
1de4fff5ba
Update of query cache code.
...
Changed some sql_alloc() -> thd->alloc()
Removed a lot of compiler warnings on Linux Alpha (64 bit)
Fixed some core dumps on 64 bit systems (wrong type for packet_len)
2001-12-05 13:03:00 +02:00
monty@hundin.mysql.fi
1d26537da5
Query cache.
...
Remove some warnings
2001-12-02 14:34:01 +02:00
monty@donna.mysql.com
b55de19ed2
Portability fixes
2000-10-04 23:20:16 +03:00
bk@work.mysql.com
f4c589ff6c
Import changeset
2000-07-31 21:29:14 +02:00