summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Manual merge after improving concurrency for key cache reassignmentigor@rurik.mysql.com2003-10-0153-771/+2408
|\
| * Many files:igor@rurik.mysql.com2003-10-017-20/+88
| | | | | | | | Improved concurrency for key cache reassignment
| * Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-08-2660-782/+2689
| |\ | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
| | * key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc:igor@rurik.mysql.com2003-08-265-34/+43
| | | | | | | | | | | | After merge fix
| | * Manual mergeigor@rurik.mysql.com2003-08-261-5/+45
| | |
| | * Manual mergeigor@rurik.mysql.com2003-08-2659-768/+2626
| | |\
| | | * Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-08-0936-157/+329
| | | |\ | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
| | | * | set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h:igor@rurik.mysql.com2003-08-0920-234/+761
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added key cache parameters for midpoint insertion strategy Many files: Added midpoint insertion strategy for key cache mi_test2.c: Added a parameter to resize_key_cache
| | | * | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-08-021-2/+11
| | | |\ \ | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
| | | * \ \ Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-08-02146-3191/+1767
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
| | | * | | | resolving bk problemsigor@rurik.mysql.com2003-08-022-3/+3
| | | | | | |
| | | * | | | Many files:igor@rurik.mysql.com2003-08-0243-292/+1130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added key cache assignment mi_locking.c: Added key cache assignment: correction my_sys.h: Added key cache variable structure
| | | * | | | Makefile.am:igor@rurik.mysql.com2003-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added mi_keycache.c
| | | * | | | Conflict resolutionigor@rurik.mysql.com2003-07-16127-1177/+3444
| | | |\ \ \ \
| | | * | | | | mi_keycache.c:igor@rurik.mysql.com2003-07-1612-12/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file Many files: Added CACHE INDEX command
| | | * | | | | range.result, range.test:igor@rurik.mysql.com2003-06-302-2/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added inequality predicate to range optimization
| | | * | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-06-3026-470/+593
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
| | | | * | | | | item_cmpfunc.h, opt_range.cc:igor@rurik.mysql.com2003-06-302-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added inequality predicate to range optimization
| | | | * | | | | mysqld.cc, handler.cc:igor@rurik.mysql.com2003-06-302-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added multiple key cache
| | | | * | | | | Many files:igor@rurik.mysql.com2003-06-3022-466/+573
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added multiple key cache
* | | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1paul@teton.kitebird.com2003-10-015-14/+39
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into teton.kitebird.com:/home/paul/mysql-4.1
| * \ \ \ \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2003-10-014-13/+38
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.stmt
| | * | | | | | | | | Fix for #1430hf@deer.(none)2003-10-014-13/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there was an error about sendind prepared parameters to the server
| * | | | | | | | | | ctype-mb.c:bar@bar.mysql.r18.ru2003-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stupid typo. Led to compilation failure with non-gcc compilers.
* | | | | | | | | | | Subselect -> subquerypaul@teton.kitebird.com2003-09-3020-34/+34
|/ / / / / / / / / /
* | | | | | | | | | - fixed yet another C++ comment inside a .c filelenz@kallisto.local2003-09-291-1/+1
|/ / / / / / / / /
* | | | | | | | | fix for #1344hf@deer.(none)2003-09-293-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling of init-file option added to embedded library main problem was killing of output (resulting recordsets etc) i added checks for empty output in Protocol:: methods better solution could be special Protocol_nul class to redirect results to nowhere
* | | | | | | | | Bugfix for #1342hf@deer.(none)2003-09-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I made libmysqld not to do freopen(stdout...) I think we need better solution here so i added it as a worklog entry #1247
* | | | | | | | | bugfix for #1375hf@deer.(none)2003-09-292-2/+4
| | | | | | | | |
* | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2003-09-291-10/+36
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.stmt
| * \ \ \ \ \ \ \ \ Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1vva@eagle.mysql.r18.ru2003-09-291-10/+36
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/help_correction/mysql-4.1
| | * \ \ \ \ \ \ \ \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1vva@eagle.mysql.r18.ru2003-09-291-10/+36
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/help_correction/mysql-4.1
| | | * | | | | | | | | added fine error messages in scripts/fill_help_tables.shvva@eagle.mysql.r18.ru2003-09-291-10/+36
| | | | | | | | | | | |
* | | | | | | | | | | | SCRUMhf@deer.(none)2003-09-294-14/+17
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | embedded library some fixes - cleanup procedure changed for embedded library - deletion of embedded mysql->thd
* | | | | | | | | | | SCRUMhf@deer.(none)2003-09-291-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WL604 Privilegies in embedded library another bug fixed
* | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2003-09-296-17/+45
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.stmt
| * | | | | | | | | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2003-09-272-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | * | | | | | | | | | - better test for a string to avoid "test: integer expression expected"lenz@kallisto.local2003-09-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if a variable is not defined (empty).
| | * | | | | | | | | | - added missing zlib subdirectory to the source distributionlenz@kallisto.local2003-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (crc32.c is included by mysys/my_crc32.c)
| * | | | | | | | | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1guilhem@mysql.com2003-09-262-6/+31
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1
| | * | | | | | | | | | A fix of the fix for BUG#1209 (was: SELECT DATABASE() still shows dropped ↵guilhem@gbichot22003-09-262-6/+31
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database). Don't free the client's selected db (thd->db) when it has been DROPped, if this is a slave thread; the x_free() was causing a lot of various bugs in rpl_loaddata_rule_m (garbage characters, segfault, hangs in other threads). A small post-merge fix (rli->inside_transaction exists in 4.0 only).
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2003-09-262-7/+10
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-rplunt
| | * | | | | | | | | | Fixed spurios failures of rpl_until test.dlenev@dlenev.mshome2003-09-262-7/+10
| | | | | | | | | | | |
* | | | | | | | | | | | SCRUMhf@deer.(none)2003-09-292-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WL#604 Privileges in embedded library bugs fixed
* | | | | | | | | | | | Mergehf@deer.(none)2003-09-2624-287/+445
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | SCRUM:hf@deer.(none)2003-09-2624-284/+445
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | LPAD and RPAD test with UCS2 was added.bar@bar.mysql.r18.ru2003-09-252-0/+52
| | | | | | | | | | | |
* | | | | | | | | | | | LPAD() and RPAD() are now multibyte-compatiblebar@bar.mysql.r18.ru2003-09-252-56/+61
| | | | | | | | | | | |
* | | | | | | | | | | | CHARSET_INFO::instr was extended to return more substring match results:bar@bar.mysql.r18.ru2003-09-255-29/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - offset of substr begining - offset of substr end - number of characters (MB compatible)
* | | | | | | | | | | | Bug fixedhf@deer.(none)2003-09-253-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null_string wasn't known in libmysqld/lib_sql.cc, that caused compiler's error i put the declaration of the null_string in mysql_priv.h and renamed it to my_null_string to reduce the probability of name's intersections
View Lorry Controller Status