summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | 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
| | * \ \ 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
| | | | | | | | | |
| | | | * | | | | | Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from ↵unknown2005-03-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the place where the second master is started
| | * | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-296-22/+6
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
| | * | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-293-14/+293
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
| * | | | | | | | | init_db.sql:unknown2005-03-291-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates to be in sync with 'mysql_create_system_tables' mysql-test/lib/init_db.sql: Updates to be in sync with 'mysql_create_system_tables'
| * | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-291-8/+24
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
| | * | | | | | | | | making Q_CATALOG_CODE be understood by 5.0.4 slave, so that 5.0.3->5.0.4 ↵unknown2005-03-291-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repl can work (but 5.0.4->5.0.3 won't).
* | | | | | | | | | | after merge fixunknown2005-03-302-6/+7
| | | | | | | | | | |
* | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-03-29126-572/+2604
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| * | | | | | | | | | type_bit.result:unknown2005-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after merge fix , mysql-test/r/type_bit.result: after merge fix ,
| * | | | | | | | | | after merge fixunknown2005-03-292-5/+5
| | | | | | | | | | |
| * | | | | | | | | | mergeunknown2005-03-295-20/+176
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/charset-def.c: Auto merged BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e: Auto merged sql/mysqld.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-utf8.c: Auto merged mysql-test/r/type_blob.result: after merge fix
| | * | | | | | | | | ctype-utf8.c, ctype-sjis.c:unknown2005-03-292-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Safer and mode readable way. strings/ctype-sjis.c: Safer and mode readable way. strings/ctype-utf8.c: Safer and mode readable way.
| | * | | | | | | | | ctype-big5.c:unknown2005-03-291-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More readable and safer way. strings/ctype-big5.c: More readable and safer way.
| | * | | | | | | | | Better error message.unknown2005-03-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugs#9057: Incorrect errormsg for too-large char field in table definition
| | * | | | | | | | | Remove redundant my_security_attr_free() from unknown2005-03-291-2/+0
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle_connections_shared_memory (double free spotted by Monty). sql/mysqld.cc: Remove excessive my_security_attr_free()
| | * | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-292-0/+172
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1
| | | * | | | | | | | Adding Cybozu's patch.unknown2005-03-292-0/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not active by default. One need to pass -DHAVE_CYBOZU_COLLATION to activate it. mysys/charset-def.c: Adding Cybozu's patch. Not active by default. strings/ctype-utf8.c: Adding Cybozu's patch. Not active by default.
| * | | | | | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-03-291-13/+117
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-5.0
| | * | | | | | | | | more merge fixesunknown2005-03-291-8/+4
| | | | | | | | | | |
View Lorry Controller Status