summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-312-2/+2
|\ | | | | | | | | | | | | into msdesk.mysql.com:/home/magnus/mysql-5.0
| * BUG#8585 ndb_cache2unknown2005-03-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | - When deleting from a cursor the m_rows_changed variable was not properly incremented to indicate that m_share->commit_count should be cleared at end of trans. sql/ha_ndbcluster.cc: Moved increment of m_rows_changed to higher up in the function. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-3110-0/+63
|\ \ | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-3117-73/+319
| |\ \ | | |/ | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-3010-0/+63
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 mysql-test/r/ps_7ndb.result: Auto merged
| | * \ Mergeunknown2005-03-3010-0/+63
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged sql/item.h: Auto merged sql/item_subselect.h: Auto merged sql/item.cc: SCCS merged
| | | * \ Merge neptunus.(none):/home/msvensson/mysql/bug8807unknown2005-03-3010-0/+63
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged
| | | | * | BUG#8807 Select crash serverunknown2005-03-3010-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add function Item_param::fix_fields which will update any subselect they are part of and indicate that the subsleect is not const during prepare phase, and thus should not be executed during prepare. mysql-test/include/ps_query.inc: Adde new test case mysql-test/r/ps_2myisam.result: Update test result mysql-test/r/ps_3innodb.result: Update test result mysql-test/r/ps_4heap.result: Update test result mysql-test/r/ps_5merge.result: Update test result mysql-test/r/ps_6bdb.result: Update test result mysql-test/r/ps_7ndb.result: Update test result sql/item.cc: Add function Item_param::fix_fields, which will mark any subselects they are part of as not being a constant expression unless the param value is specified, ie. it will be not be constant during prepare phase. sql/item.h: Adde Item_param::fix_fields sql/item_subselect.h: Make Item_param::fix_field friend of Item_subselect
* | | | | | Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-3117-73/+319
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/bk/mysql-5.0 sql/share/errmsg.txt: Auto merged sql/sql_yacc.yy: Auto merged
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-3017-73/+319
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * | | | Enabled more tests of STR_TO_DATE()unknown2005-03-304-45/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed that datetime gives warning for zero dates in traditional mode mysql-test/r/strict.result: Enabled more tests of STR_TO_DATE() mysql-test/t/strict.test: Enabled more tests of STR_TO_DATE() sql/field.cc: Fixed that datetime gives warning for zero dates in traditional mode sql/log_event.h: Fix wrong ifdef from last push
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-3017-29/+280
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0 sql/log_event.cc: Auto merged sql/share/errmsg.txt: Auto merged
| | | * | | Give warnings if wrong date/time/datetime argument for STR_TO_DATEunknown2005-03-3014-24/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small fixes while doing review of new pushed code More test cases for decimal mysql-test/r/date_formats.result: Warnings added for STR_TO_DATE() mysql-test/r/ps_1general.result: Better description for BLACKHOLE mysql-test/r/strict.result: Added tests for STR_TO_DATE mysql-test/r/type_decimal.result: Test to test ranges of DECIMAL mysql-test/t/date_formats.test: More tests mysql-test/t/strict.test: Added tests for STR_TO_DATE mysql-test/t/type_decimal.test: Test to test ranges of DECIMAL sql/field.cc: Simple optimization sql/handler.cc: Better description for BLACKHOLE sql/item_timefunc.cc: Give warnings if wrong date/time/datetime argument for STR_TO_DATE sql/log_event.cc: Indentation fixes sql/log_event.h: #ifdef-ed not used code sql/share/errmsg.txt: New error message sql/sql_show.cc: Ensure that we do a proper restore in case of error
| | | * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-293-5/+8
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0 sql/sql_acl.cc: Auto merged
| | | | * | | Cleanups during reviewunknown2005-03-293-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/DictCache.cpp: Simpler bit handling code sql/sql_acl.cc: Fix for bool parameter sql/sql_yacc.yy: Removed compiler warning
* | | | | | | Fixed BUG#6600: Stored procedure crash after repeated calls with check table.unknown2005-03-308-50/+38
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sedond attempt: Simply disallow CHECK in SPs, since it can't work. mysql-test/r/sp-error.result: New test cast for BUG#6600 mysql-test/r/sp.result: Removed old test case for BUG#6600 mysql-test/t/sp-error.test: New test cast for BUG#6600 mysql-test/t/sp.test: Removed old test case for BUG#6600 sql/share/errmsg.txt: Made the SP bad statement error message more general. sql/sp_head.cc: CHECK is not possible in stored procedures. sql/sql_parse.cc: Undid attempt to fix CHECK in stored procedures, it didn't work. sql/sql_yacc.yy: CHECK is not possible in stored procedures. (And updated error messages for LOCK/UNLOCK.)
* | | | | | after merge fix/unknown2005-03-302-6/+5
| | | | | |
* | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-300-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-5.0 include/violite.h: Auto merged mysql-test/r/ps_7ndb.result: Auto merged sql/sql_parse.cc: Auto merged
| * | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-03-305-13/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0 BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Auto merged
| | * \ \ \ \ mergedunknown2005-03-306-15/+18
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union include/violite.h: Auto merged mysql-test/r/ps_7ndb.result: Auto merged sql/sql_parse.cc: Auto merged
* | | | | | | Mergeunknown2005-03-309-34/+31
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/violite.h: Auto merged mysql-test/r/ps_7ndb.result: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Manual merge
| * | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-301-15/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-4.1
| | * | | | | | A fix (bug #9401: type_timestamp segfaults mysqld)unknown2005-03-301-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_select.cc: A fix (bug #9401: type_timestamp segfaults mysqld). 1. create_tmp_field_from_field() is modified to take 'Item_ref *item' and 'char *name' instead of 'bool modify_item' and 'Item *item'. 2. For Item_sum_min/max we should never modify item, so NULL is passed as item to the create_tmp_field_from_field().
| * | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-303-6/+4
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1
| | * | | | | | Remove .opt file for faster test running.unknown2005-03-303-6/+4
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106: Delete: mysql-test/t/ctype_cp1251-master.opt
| * | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-03-305-13/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | | | mergedunknown2005-03-301-6/+5
| | |\ \ \ \ \
| | | * | | | | don't strcmp db if it's a patternunknown2005-03-301-4/+5
| | | | | | | |
| | * | | | | | Fedora now defines read(2)/write(2) as macros.unknown2005-03-293-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Argh!
| | * | | | | | typo fixedunknown2005-03-291-1/+1
| | | | | | | |
| | * | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-03-290-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 mysql-test/r/ps_7ndb.result: Auto merged
| | | * \ \ \ \ \ Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-03-291-11/+11
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | | * | | | | | update resultsunknown2005-03-291-11/+11
| | | | | | | | | |
* | | | | | | | | | Mergeunknown2005-03-301-2/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Merge from 4.0 and 4.1
| * | | | | | | | | Mergeunknown2005-03-301-1/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Merge from 4.0
| | * | | | | | | | | Do-compile:unknown2005-03-302-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added option --with-big-tables Build-tools/Do-compile: Added option --with-big-tables BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perlunknown2005-03-301-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | / / / / | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile Build-tools/Do-compile: Auto merged
| * | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-301-1/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
| | * | | | | | | | | Do-compile:unknown2005-03-301-1/+3
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added option --with-blackhole Build-tools/Do-compile: Added option --with-blackhole
* | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-03-305-27/+73
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| * \ \ \ \ \ \ \ \ \ Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0unknown2005-03-291-0/+28
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/push-5.0unknown2005-03-291-0/+28
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Implement the new '--with-big-tables' flag to "configure".unknown2005-03-291-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using it comes merged from 4.1. config/ac-macros/misc.m4: Implement the new '--with-big-tables' flag to "configure".
| * | | | | | | | | | | | Propagate the new '--with-big-tables' flag from 4.1 to 5.0.unknown2005-03-292-11/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | / / / / / / / / / | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incomplete, as the macro body must ne in the new file 'config/ac-macros/misc.m4' which will follow in a separate changeset. BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Merge the 4.0 and 4.1 change of the new '--with-big-tables' flag. configure.in: Call the new macro to evaluate the '--with-big-tables' flag. mysql-test/mysql-test-run.sh: No change in 5.0, as 4.1 was a backport (Martin). mysql-test/r/ps_7ndb.result: Merge from 4.1 (Martin).
| | * | | | | | | | | | Mergeunknown2005-03-292-0/+29
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | / / / / / / / | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged acinclude.m4: SCCS merged
| | | * | | | | | | | Post-review fix: Drop the duplicate assignment.unknown2005-03-291-2/+0
| | | | | | | | | | |
| | | * | | | | | | | Introduce "configure" support for a new '-with-big-tables' option that can ↵unknown2005-03-292-0/+31
| | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace the current way of passing '-DBIG_TABLES' to the compilers. This is needed even in 4.0, as 'Do-compile-all' must use this new approach for all "max" builds in 4.0, 4.1, and up. acinclude.m4: Provide a new macro 'MYSQL_CHECK_BIG_TABLES' to check a '-with-big-tables' option and set the CPP symbol 'BIG_TABLES' accordingly. configure.in: Call the new 'MYSQL_CHECK_BIG_TABLES' macro.
| | * | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-292-13/+14
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
| | | * \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-292-13/+14
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| | | | * | | | | | | New test resultunknown2005-03-291-11/+11
| | | | | | | | | | |
View Lorry Controller Status