summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Makefile.am:unknown2003-07-161-1/+1
| | | | | | | | Added mi_keycache.c myisam/Makefile.am: Added mi_keycache.c
* Conflict resolutionunknown2003-07-16127-1177/+3444
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_sys.h: Auto merged sql/handler.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/mysqld.cc: Manual merge
| * Item_func_null doesn't have a separate Item for the first argument anymore.unknown2003-07-168-87/+100
| | | | | | | | | | | | | | args[0] is used instead. This allowed to resuse a lot of code.
| * Update openssl_1 test.unknown2003-07-152-4/+6
| |
| * Merge abarkov@build.mysql.com:/home/bk/mysql-4.1unknown2003-07-155-58/+14
| |\ | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| | * ELT passes the first argument in args[0] instead of having a separate Item.unknown2003-07-155-58/+14
| | |
| * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-151-5/+4
| |\ \ | | |/ | |/| | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/4.1
| | * bugfix for the bugfix for the bug #539unknown2003-07-151-5/+4
| | |
| * | Item_func_field doesn't have a separate Item to store the first argument.unknown2003-07-155-68/+18
| |/ | | | | | | | | | | | | It's now passed as args[0]. This fix allowed to resuse a lot of code.
| * mysql should ignore ' " ` symbols inside comments (Bug #539).unknown2003-07-151-6/+8
| |
| * Fix bug: mysqld crashes on func_sapdb test.unknown2003-07-151-1/+1
| |
| * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-154-18/+17
| |\ | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/4.1
| | * Fix for the bug #841: wrong number of warningsunknown2003-07-144-18/+17
| | |
| * | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-1422-40/+40
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into teton.kitebird.com:/home/paul/mysql-4.1
| | * \ Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-105-10/+10
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | into teton.kitebird.com:/home/paul/mysql-4.1
| | * | Error message style consistency edits.unknown2003-07-0922-40/+40
| | | |
| * | | Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-144-1/+35
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/work/sql/dev-4.1
| | * \ \ Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-134-6/+18
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/work/sql/dev-4.1 sql/item_strfunc.cc: Auto merged
| | * \ \ \ Mergeunknown2003-07-114-1/+35
| | |\ \ \ \
| | | * | | | Add the support of 'SUBSTR' function compatible with Oracle and SAPDB (SCRUM ↵unknown2003-07-114-1/+35
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #872) sql/lex.h: Add SUBSTR aliased to SUBSTRING sql/item_strfunc.cc: Implement SUBSTR negative offset mysql-test/t/func_str.test: New tests for SUBSTR mysql-test/r/func_str.result: Updated SUBSTR results
| * | | | | COALESCE now aggregates its argument types in this way:unknown2003-07-143-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if some of the arguments is STRING_RESULT the STRING_RESULT else if some of the arguments is REAL_RESULT then REAL_RESULT else INT_RESULT
| * | | | | A test for character conversion in ALTER TABLE was addedunknown2003-07-142-0/+66
| | | | | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-144-6/+18
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | | Removed unreferenced local variableunknown2003-07-131-1/+0
| | | | | |
| | * | | | Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.unknown2003-07-123-5/+18
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS. Removed PURGE LOGS (now PURGE MASTER LOGS). Added SHOW BDB LOGS as synonym for SHOW LOGS. Note: tests key_cache.test hanged, rpl_log_pos.test, rpl_rotate_logs.test failed for me. For the second and third one I guess this will disappear after merging 4.0. mysql-test/r/rpl_rotate_logs.result: result update mysql-test/t/rpl_rotate_logs.test: added test for synonym PURGE BINARY LOGS, changed PURGE LOGS to PURGE MASTER LOGS. sql/sql_yacc.yy: Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS. Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS. Removed PURGE LOGS (now PURGE MASTER LOGS). Added SHOW BDB LOGS as synonym for SHOW LOGS.
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-116-10/+12
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | field_conv.cc:unknown2003-07-111-0/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Data was not converted when ALTER TABLE CHAGE changed a field character set. sql/field_conv.cc: Data was not converted when ALTER TABLE CHAGE changed a field character set.
| | * | - Updated error message tests in several results of the test suite afterunknown2003-07-105-10/+10
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the server error messages had been modified in errmsg.txt mysql-test/r/create.result: - Updated error message in result after errmsg.txt has been modified mysql-test/r/drop.result: - Updated error message in result after errmsg.txt has been modified mysql-test/r/rpl000009.result: - Updated error message in result after errmsg.txt has been modified mysql-test/r/symlink.result: - Updated error message in result after errmsg.txt has been modified mysql-test/r/warnings.result: - Updated error message in result after errmsg.txt has been modified
| * | comment clarifiedunknown2003-07-091-1/+1
| |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-0842-127/+572
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1 sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/serbian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-0842-127/+572
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1 sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
| | | * Support for variables with componentsunknown2003-07-0642-127/+572
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added framework to create/drop and manager buffers for multiple key caches include/my_getopt.h: Fixed prototype include/my_sys.h: Added (temporary) KEY_CACHE type include/mysqld_error.h: New error messages mysql-test/r/select_safe.result: Updated test results mysql-test/r/variables.result: Updated test results mysys/my_getopt.c: Fixed bugs with GET_ASK_ADDR sql/Makefile.am: Make sql_yacc.o depend on all header files in sql directory sql/item_func.cc: Added support for variable components sql/mysql_priv.h: Added support for variable components sql/mysqld.cc: Added support for multiple key caches sql/set_var.cc: Added support for multiple key caches sql/set_var.h: Added support for multiple key caches sql/share/czech/errmsg.txt: New error messages sql/share/danish/errmsg.txt: New error messages sql/share/dutch/errmsg.txt: New error messages sql/share/english/errmsg.txt: New error messages sql/share/estonian/errmsg.txt: New error messages sql/share/french/errmsg.txt: New error messages sql/share/german/errmsg.txt: New error messages sql/share/greek/errmsg.txt: New error messages sql/share/hungarian/errmsg.txt: New error messages sql/share/italian/errmsg.txt: New error messages sql/share/japanese/errmsg.txt: New error messages sql/share/korean/errmsg.txt: New error messages sql/share/norwegian-ny/errmsg.txt: New error messages sql/share/norwegian/errmsg.txt: New error messages sql/share/polish/errmsg.txt: New error messages sql/share/portuguese/errmsg.txt: New error messages sql/share/romanian/errmsg.txt: New error messages sql/share/russian/errmsg.txt: New error messages sql/share/serbian/errmsg.txt: New error messages sql/share/slovak/errmsg.txt: New error messages sql/share/spanish/errmsg.txt: New error messages sql/share/swedish/errmsg.txt: New error messages sql/share/ukrainian/errmsg.txt: New error messages sql/sql_lex.cc: Fixes for quoting of variables. sql/sql_parse.cc: Fix after changing prototype for get_system_var sql/sql_show.cc: Fix after introducing variable components sql/sql_yacc.yy: Support for variables with components (To support multiple key caches)
| * | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-0821-82/+1149
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into ice.snake.net:/Users/paul/mysql-4.1
| | * | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-087-1/+33
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC sql/mysql_priv.h: Auto merged
| | | * \ Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-087-1/+33
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/work/sql/dev-4.1
| | | | * | implementation of mysql_stmt_reset client endunknown2003-07-087-1/+33
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/mysql.h: add mysql_stmt_reset prototype include/mysql_com.h: add COM_STMT_RESET libmysql/libmysql.def: Add mysql_stmt_reset def sql/sql_prepare.cc: Fix selects hang after windows slowdown issue fix (send_fields) sql/sql_parse.cc: Add COM_STMT_RESET sql/mysql_priv.h: add defination of mysql_stmt_reset
| | * | | SAPDB date/time finctionsunknown2003-07-0812-236/+238
| | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/cast.result: Changes for SAPDB date/time finctions
| | * | | Merge gluh@gw:/home/bk/mysql-4.1unknown2003-07-0812-32/+1065
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC sql/field.cc: Auto merged sql/item_create.cc: Auto merged sql/mysql_priv.h: Auto merged sql/protocol.cc: Auto merged sql/sql_yacc.yy: Auto merged
| | | * | Merge gluh@gw:/home/bk/mysql-4.1unknown2003-06-2312-32/+1065
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC sql/field.cc: Auto merged sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/lex.h: Auto merged sql/mysql_priv.h: Auto merged sql/protocol.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/time.cc: Auto merged
| | | | * | Internal commitunknown2003-06-2312-32/+1065
| | | | | |
| * | | | | Error message edits. (Change sentence ending with period + sentenceunknown2003-07-0716-30/+30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not ending with period into single sentence.) sql/share/czech/errmsg.txt: Error message edits. sql/share/danish/errmsg.txt: Error message edits. sql/share/dutch/errmsg.txt: Error message edits. sql/share/english/errmsg.txt: Error message edits. sql/share/french/errmsg.txt: Error message edits. sql/share/german/errmsg.txt: Error message edits. sql/share/italian/errmsg.txt: Error message edits. sql/share/norwegian-ny/errmsg.txt: Error message edits. sql/share/norwegian/errmsg.txt: Error message edits. sql/share/polish/errmsg.txt: Error message edits. sql/share/portuguese/errmsg.txt: Error message edits. sql/share/romanian/errmsg.txt: Error message edits. sql/share/serbian/errmsg.txt: Error message edits. sql/share/slovak/errmsg.txt: Error message edits. sql/share/spanish/errmsg.txt: Error message edits. sql/share/swedish/errmsg.txt: Error message edits.
| * | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-07-074-51/+63
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1
| | * | | | fixed memory leak in group_concat function (BUG#796)unknown2003-07-063-42/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed test func_gconcat to be repeatable independent of presend tables and avoid removing user tables mysql-test/r/func_gconcat.result: removed warning in test fixed table tnames (should be tN, where N is number) mysql-test/t/func_gconcat.test: removed warning in test fixed table tnames (should be tN, where N is number) sql/item_sum.cc: added debug information fixed memory leak in group_concat function
| | * | | | reduced using of slow current_thd/current_lex macrounknown2003-07-054-9/+23
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialization of item_thd moved to constructor (in any case we need thd in constructor) initialization of group_concat_max_len to constructor to avoid incorrect length reporting (BUG#757) removed Item_func_group_concat::fix_length_and_dec() because item have its own fix_fields and will not have inherited items mysql-test/r/func_gconcat.result: test for BUG#757 mysql-test/t/func_gconcat.test: test for BUG#757 sql/item_sum.cc: reduced using of slow current_thd/current_lex macro initialization of item_thd moved to constructor (in any case we need thd in constructor) initialization of group_concat_max_len to constructor to avoid incorrect length reporting (BUG#757) sql/item_sum.h: removed Item_func_group_concat::fix_length_and_dec() because item have its own fix_fields and will not have inherited items
| * | | | fixed subselect with to temporary tables executingunknown2003-07-072-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (now it return correct results. Test was commited before, but it is not pushed, BUG# is not registered, because bug was introduced after release) sql/sql_select.cc: fixed subselect with to temporary tables executing sql/sql_select.h: fixed subselect with to temporary tables executing
| * | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-07-0517-205/+339
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1 mysql-test/t/subselect.test: Auto merged sql/sql_select.cc: Auto merged
| | * | | Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-041-0/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/work/sql/dev-4.1
| | | * | | Fix for send_fields flush after a fix for windows slowdown issueunknown2003-07-041-0/+3
| | | | | |
| | * | | | More code was reusedunknown2003-07-043-46/+13
| | | | | |
| | * | | | Better arguments format to allow reuse more codeunknown2003-07-043-18/+18
| | | | | |
View Lorry Controller Status