summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* New methods unknown2003-07-045-57/+90
| | | | | | | | | | Item_func::agg_arg_collations() Item_func::arr_arg_collations_for_comparison() to aggregate argument collations. It helps to reuse a lot of code.
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-041-16/+15
|\ | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1
| * Fixed problem with stacksize on Unixwareunknown2003-07-041-16/+15
| |
* | Merge abarkov@build.mysql.com:/home/bk/mysql-4.1unknown2003-07-034-15/+89
|\ \ | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| * | FIELD() now takes in account arguments collationsunknown2003-07-034-15/+89
| | |
* | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-07-036-36/+72
|\ \ \ | |/ / | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
| * | Row comparison now does compare field collations, e.g.unknown2003-07-034-34/+68
| |/ | | | | | | | | | | | | | | | | | | | | | | | | ROW('a','b','c) = ROW('A' collate latin1_bin,'b','c') returns 0 When a number is compared to a string, character sets and collations are not aggregated. e.g. this returned error in 4.1.0: SELECT 1=_latin2'1'; because character sets was aggregated, and 1 was considered as a string of latin1 charset during this aggregation.
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-032-2/+4
| |\ | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1
| | * Fixed test case to be more portableunknown2003-07-032-2/+4
| | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_gconcat.result: Update results mysql-test/t/func_gconcat.test: Make tests repeatable. The problem is that due to floating point handling / qsort implementation the way rows are read may differ between versions
* | | fixed typo in previous fixunknown2003-07-031-1/+1
| | |
* | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-07-031-12/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 sql/sql_select.cc: Auto merged
| * | after review fixunknown2003-07-031-12/+4
| | |
* | | There is no Item->binary() anymore. It was remain from 4.0.unknown2003-07-027-25/+17
| | |
* | | fixed typosunknown2003-07-021-2/+2
| | |
* | | fixed bug, which lead to crash mysqld by running 'mysql some_db_with_tables'unknown2003-07-021-1/+7
| | |
* | | Removed dbug.h inclussion from client/get_password.c (windows build fix)unknown2003-07-021-1/+0
| | | | | | | | | | | | | | | client/get_password.c: Removed dbug.h inclussion (windows build fix)
* | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-07-0128-382/+785
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-err-4.1 mysql-test/r/subselect.result: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-0127-381/+784
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1 mysql-test/r/grant_cache.result: Auto merged
| | * | Fixed testcases and bug introduced by last changesetunknown2003-07-013-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_gconcat.result: Fixed test case after merge mysql-test/r/grant_cache.result: Updated test case (Wrong push by some developer) mysys/mf_loadpath.c: Fix for my_load_path() and ./directory handling from last changeset
| | * | mergeunknown2003-07-0126-379/+779
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acinclude.m4: Auto merged mysql-test/r/subselect.result: Auto merged scripts/mysql_create_system_tables.sh: Auto merged sql/sql_class.h: Auto merged sql/sql_yacc.yy: Auto merged
| | | * Fix needed to support MERGE tables in different databasesunknown2003-07-014-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/merge.result: Test of MERGE table patch mysql-test/t/merge.test: Test of MERGE table patch
| | | * LAST_INSERT_ID() should not be set if we couldn't generate an auto_increment id.unknown2003-06-304-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/auto_increment.result: Update after auto_increment fix mysql-test/t/auto_increment.test: Another fix for LAST_INSERT_ID() sql/handler.cc: Another fix for LAST_INSERT_ID() sql/sql_class.h: Another fix for LAST_INSERT_ID()
| | | * Remove FORCE_INIT_OF_VARS when compiling for valgrind/purify to spot wrong ↵unknown2003-06-3010-270/+500
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LINT_INIT() options Fixed bug in ALTER TABLE ... MODIFY integer-column Added ref_or_null optimization (needed for subqueries) BUILD/compile-pentium-valgrind-max: Remove FORCE_INIT_OF_VARS to spot wrong LINT_INIT() options mysql-test/r/distinct.result: Update of test results (new optimizer) mysql-test/r/null_key.result: Update after ref_or_null optimization mysql-test/r/subselect.result: Update after ref_or_null optimization mysql-test/t/null_key.test: New tests for ref_or_null optimization sql/sql_select.cc: Added ref_or_null optimization Optimized find_best_combinations() and read-functions sql/sql_select.h: Added ref_or_null optimization sql/sql_yacc.yy: Fixed bug in ALTER TABLE ... MODIFY integer-column sql/table.cc: Safety fix for ALTER TABLE .. MODIFY sql/unireg.cc: Safety fix for ALTER TABLE .. MODIFY
| | | * Mergeunknown2003-06-291-2/+2
| | | |\
| | | | * - ISAM storage engine is now disabled by default. To enable it, configureunknown2003-05-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the sources with "--with-isam"
| | | * | Allow one to use MERGE tables with tables from different databasesunknown2003-06-279-90/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added command 'replace_column' to mysqltest client/mysqltest.c: Added user command replace_column mysql-test/r/merge.result: Update of tests mysql-test/t/innodb.test: User replace_column to make tests repeatable mysql-test/t/merge.test: New tests for testing MERGE tables with multiple databases scripts/mysql_create_system_tables.sh: Fixed syntax error sql/ha_myisammrg.cc: Allow one to use MERGE tables with tables from different databases sql/mysql_priv.h: Added function sql/sql_parse.cc: Allow one to use MERGE tables with tables from different databases sql/sql_show.cc: Extended append_identifier()
| | | * | Fixed slowdown problem on windowsunknown2003-06-251-1/+1
| | | | |
| | | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-240-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1 BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43: Auto merged
| | | | * | indentation changeunknown2003-06-241-13/+14
| | | | | |
| * | | | | fexed erroro messageunknown2003-07-011-1/+1
| |/ / / /
* | | | | fixed uninitialized pointerunknown2003-07-012-1/+11
| | | | |
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-07-011-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-err-4.1
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-011-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/work/sql/dev-4.1
| | * | | | sql_state.h:unknown2003-07-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor fixups for SQLSTATE values to be compatible with ODBC spec include/sql_state.h: Minor fixups for SQLSTATE values to be compatible with ODBC spec
* | | | | | mergedunknown2003-07-016-8/+47
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_subselect.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged
| * | | | | Fixed error handling to be able do not interrupt update (907) (SCRUM)unknown2003-06-257-11/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed bug of current select pointer in subselect execution fixed layuot mysql-test/r/subselect.result: test of update with IGNORE option and error in subselect mysql-test/t/subselect.test: test of update with IGNORE option and error in subselect sql/item_subselect.cc: fixed bug of current select pointer sql/mysqld.cc: error converting to warnings if hd->lex.current_select->no_error id true layout fixed sql/sql_lex.cc: initialization sql/sql_lex.h: flag which force converting errors to warnings sql/sql_select.cc: switch on error convering to warnings in select executing if IGNORE option present
* | | | | | Made check for structured option handling more robust and faster.unknown2003-06-301-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier it could have failed in some special cases.
* | | | | | mergedunknown2003-06-2910-10/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_cmpfunc.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged
| * | | | | | cond_count moved to SELECT_LEX_NODEunknown2003-06-2610-10/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed BUG #726 mysql-test/r/subselect.result: test of bug #726 mysql-test/t/subselect.test: test of bug #726 sql/item_cmpfunc.cc: cond_count moved to SELECT_LEX_NODE sql/item_subselect.cc: fixed current_select pointer sql/sql_base.cc: cond_count moved to SELECT_LEX_NODE sql/sql_class.cc: cond_count moved to SELECT_LEX_NODE sql/sql_class.h: cond_count moved to SELECT_LEX_NODE sql/sql_lex.cc: cond_count moved to SELECT_LEX_NODE sql/sql_lex.h: cond_count moved to SELECT_LEX_NODE sql/sql_select.cc: cond_count moved to SELECT_LEX_NODE
* | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-06-296-2/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
| * \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1/unknown2003-06-296-2/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | | | | | fixed a bug that made 4.0 MYI+FT files unreadable in 4.1unknown2003-06-282-2/+1
| | | | | | | | |
| | * | | | | | | timestamp MYD-4.0 format compatibility fixunknown2003-06-281-0/+1
| | | | | | | | |
| | * | | | | | | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-06-273-0/+12
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | * | | | | | | fix test when no InnoDB is presentunknown2003-06-271-0/+2
| | | | | | | | | |
| | | * | | | | | | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-06-262-0/+10
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | | * | | | | | | preload.test:unknown2003-06-261-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change mode to -rw-rw-r-- mysql-test/t/preload.test: Change mode to -rw-rw-r--
| | | | * | | | | | | Mergeunknown2003-06-241-0/+10
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| | | | | * | | | | | comment addedunknown2003-06-161-0/+10
| | | | | | | | | | |
* | | | | | | | | | | fixed bug #745unknown2003-06-283-1/+7
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (resolving fields of reduced subselect) mysql-test/r/subselect.result: test of bug #745 mysql-test/t/subselect.test: test of bug #745 sql/sql_union.cc: to get chance of outer resolved_fields resolve fields of result table as usual fileds