summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/svoj/devel/mysql/mysql-5.0-buildunknown2005-05-2012-16/+12
|\ | | | | | | | | | | | | into mysql.com:/mnt/archive/svoj/mysql/mysql-5.1
| * WL#2286 - Compile MySQL w/YASSL supportunknown2005-05-2012-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portability fixes extra/yassl/include/buffer.hpp: Use assert.h instead of less portable cassert extra/yassl/include/log.hpp: Use stdio.h instead of less portable cstdio extra/yassl/include/socket_wrapper.hpp: Use assert.h instead of less portable cassert extra/yassl/mySTL/helpers.hpp: Use stdlib.h instead of less portable cstdlib extra/yassl/mySTL/stdexcept.hpp: Use string.h instead of less portable cstring extra/yassl/mySTL/vector.hpp: Use assert.h instead of less portable cassert extra/yassl/src/ssl.cpp: Use stdio.h instead of less portable cstdio extra/yassl/taocrypt/include/block.hpp: Use stddef.h instead of less portable cstddef, always use ptrdiff_t instead of less portable std::ptrdiff_t extra/yassl/taocrypt/include/file.hpp: Use stdio.h instead of less portable cstdio extra/yassl/taocrypt/include/integer.hpp: Use string.h instead of less portable cstring extra/yassl/taocrypt/include/runtime.hpp: Use stdlib.h instead of less portable cstdlib extra/yassl/taocrypt/src/dh.cpp: Use math.h instead of less portable cmatch
* | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-2034-233/+692
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1 configure.in: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_udf.cc: Auto merged sql/unireg.cc: Auto merged storage/ndb/include/kernel/ndb_limits.h: Auto merged storage/ndb/include/kernel/signaldata/GetTabInfo.hpp: Auto merged storage/ndb/include/ndbapi/Ndb.hpp: Auto merged storage/ndb/include/ndbapi/ndbapi_limits.h: Auto merged storage/ndb/include/transporter/TransporterDefinitions.hpp: Auto merged storage/ndb/src/common/transporter/Packer.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged storage/ndb/src/ndbapi/Ndb.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbImpl.hpp: Auto merged storage/ndb/src/ndbapi/Ndbinit.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged
| * \ Merge mysql.com:/home/jimw/my/mysql-5.0-buildunknown2005-05-191-2/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| | * Merge mysql.com:/home/jimw/my/mysql-5.0-8271unknown2005-05-191-2/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-build
| | | * Fix change to allow FIFO as log. (Bug #8271)unknown2005-05-191-1/+3
| | | | | | | | | | | | | | | | | | | | mysys/mf_iocache.c: Reset seek_not_done after doing a seek.
| | | * Avoid doing a seek when first setting up the IO cache for a file,unknown2005-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which allows a FIFO to be used for the non-binary logs. (Bug #8271) mysys/mf_iocache.c: Don't set seek_not_done if the position of the file is already where we expected it to be.
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-205-4/+419
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| | * | | after mergeunknown2005-05-191-0/+126
| | | | |
| | * | | mergedunknown2005-05-195-4/+293
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_udf.cc: Auto merged sql/unireg.cc: Auto merged
| | | * \ \ Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-05-195-8/+191
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | | * | | after merge fixunknown2005-05-192-2/+2
| | | | | | |
| | | | * | | mergedunknown2005-05-185-8/+191
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/unireg.cc: Auto merged
| | | | | * \ \ Merge bk-internal:/home/bk/mysql-4.0/unknown2005-05-181-4/+6
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | | | | * | | udf: when banning paths from soname in CREATE FUNCTION, check for \ on windows.unknown2005-05-181-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when reporting an error, use an appropriate buffer for udf->name
| | | | | * | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-05-153-2/+185
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.0-bug10095
| | | | | | * | | | Fix for BUG#10095: {wrong query results because of incorrect constant ↵unknown2005-05-153-2/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | propagation} The problem: base_list::remove didn't modify base_list::last when removing the last list element. The fix: If we remove the last element, find the element before it (by walking from the beginning of the list) and set base_list::last accordingly. The list gets corrupted in both 4.0 and 4.1. There are no visible problems in current 4.1 because current 4.1 doesn't call where_cond->fix_fields() after constant propagation step. mysql-test/r/select.result: Testcase for BUG#10095 mysql-test/t/select.test: Testcase for BUG#10095 sql/sql_list.h: Fix for BUG#10095: {wrong query results because of incorrect constant propagation} The problem: base_list::remove didn't modify base_list::last when removing the last list element. The fix: If we remove the last element, find the element before it (by walking from the beginning of the list) and set base_list::last accordingly.
| | | | | * | | | | Fixed compiler failureunknown2005-05-141-0/+1
| | | | | | | | | |
| * | | | | | | | | Change to 5.0.7(again)unknown2005-05-201-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Bump version number
| * | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-buildunknown2005-05-192-3/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build
| | * | | | | | | | Cset exclude: matt@mysql.com|ChangeSet|20050519052223|06259unknown2005-05-192-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050425090838|60886 configure.in: Exclude sql/opt_range.cc: Exclude
| * | | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-buildunknown2005-05-204-6/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/mysql-5.0-build
| | * | | | | | | | WL#2286 - Compile MySQL w/YASSL supportunknown2005-05-204-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compilation fixes extra/yassl/src/cert_wrapper.cpp: yaSSL compilation fix on nocona extra/yassl/taocrypt/include/error.hpp: yaSSL compilation fix extra/yassl/taocrypt/include/misc.hpp: yaSSL compilation fix on many platforms tools/Makefile.am: mysqltestmanager with yaSSL enabled compilation fix on FreeBSD 5.3
| * | | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-buildunknown2005-05-196-33/+46
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build sql/item_func.cc: Auto merged
| | * | | | | | | | | hf's fix for bug #9060 (FORMAT returns incorrect result)unknown2005-05-205-8/+24
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need proper rounding there mysql-test/r/func_math.result: test result fixed mysql-test/t/func_math.test: test case added sql/item_func.cc: my_double_round implementation added sql/item_strfunc.cc: my_double_round used sql/mysql_priv.h: my_double_round interface
| | * | | | | | | | Merge mysql.com:/usr/home/ram/work/mysql-4.1-buildunknown2005-05-191-25/+22
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-5.0-build sql/spatial.cc: Auto merged
| | | * | | | | | | | hf's fix for bug #10626 ( gis.test fails)unknown2005-05-191-25/+22
| | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/spatial.cc: just float8get doesn't work well with the local variables - they can be of processor-specific floating type - not the standard decimal (by hf)
| * | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug9626unknown2005-05-192-6/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build mysql-test/r/type_newdecimal.result: Auto merged mysql-test/t/type_newdecimal.test: Auto merged sql/item_func.cc: Auto merged
| | * | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-buildunknown2005-05-191-4/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into msdesk.mysql.com:/home/magnus/mysql-5.0-build
| | | * | | | | | | | Fixunknown2005-05-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Removed fix, does not work.
| | * | | | | | | | | a fix (#10742: Can't compile "sql_lex.cc" on AIX 5.2).unknown2005-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/gen_lex_hash.cc: a fix (#10742: Can't compile "sql_lex.cc" on AIX 5.2). typo fixed.
| | * | | | | | | | | a fix (bug #10599: Numeric function 'abs' make server crash).unknown2005-05-193-32/+47
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_func.cc: a fix (bug #10599: Numeric function 'abs' make server crash). Item_func_abs::decimal_op() now returns 0 if NULL. trivial optimization - get rid of an extra jump for common situations. fixed Item_func_neg::decimal_op() return value if NULL.
| * | | | | | | | | BUG#9626 valgrind warningsunknown2005-05-194-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - after review fixes mysql-test/r/ndb_basic.result: Test using table with long name mysql-test/t/ndb_basic.test: Test using table with long name ndb/include/transporter/TransporterDefinitions.hpp: Define constant for max section size ndb/src/ndbapi/NdbDictionaryImpl.cpp: Add check for not sending too long table name to ndb kernel
| * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-1914-185/+197
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug9626
| | * | | | | | | | Fix unknown2005-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/NdbDictionaryImpl.hpp: Don't use length when comparing column names
| | * | | | | | | | Mergeunknown2005-05-1814-185/+197
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/kernel/ndb_limits.h: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged mysys/thr_alarm.c: Manual merge
| | | * | | | | | | | BUG#9626unknown2005-05-1813-184/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix valgrind warnings - Remove static db, schema and table name buffers from Ndb.cpp mysys/thr_alarm.c: Initialise sact to zero ndb/include/kernel/ndb_limits.h: Set MAX_ATTR_NAME_SIZE to NAME_LEN which is tha maximum in MySQL ndb/include/kernel/signaldata/GetTabInfo.hpp: Clean up ndb/include/ndbapi/Ndb.hpp: Remove NDB_MAX_INTERNAL_NAME_LENGTH and all char buffers for schema, db and tablename. Made them dynamic and moved to NdbImpl.hpp ndb/include/ndbapi/ndbapi_limits.h: Remove the static length's of attr, db, schema and table name. ndb/src/common/transporter/Packer.cpp: Set theSignalId to ~0 when unpacking signal ndb/src/ndbapi/Ndb.cpp: Moved schema, database and tablename to NdbImpl.hpp ndb/src/ndbapi/NdbDictionaryImpl.cpp: Add NdbIndexImpl::init and NdbEventImpl::init Init all vars in NdbIndexImpl, NdbEventImpl, NdbTableImpl and NdbIndexImpl Delete the pseudo column NDB$RANGE_NO Copy tablename to internal buff in NdbDictInterface to get proper alignment. Convert length of table name from bytes words, when setting sz of LinearSectionPtr Set LinearSectionPtr array size to number of LinearSections used - save some stack. ndb/src/ndbapi/NdbDictionaryImpl.hpp: Add NdbEventImpl::init and NdbIndexImpl::init Remove clearNewProperties and copyNewProperties, it's easier to check if all vars are initied if it's done in the same func. Add buffer for tabname ti NdbDictInterface, memset it to 0 in initializer. ndb/src/ndbapi/NdbImpl.hpp: Use BaseString for table, schema and db names. ndb/src/ndbapi/Ndbinit.cpp: Move schema and db name to NdbImpl and use BaseString ndb/src/ndbapi/ndb_cluster_connection.cpp: Destroy ndb_global_event_buffer_mutex and ndb_print_state_mutex sql/ha_ndbcluster.cc: Check if pTrans is not null before calling closeTransaction Remove NDB_MAX_ATTR_NAME_SIZE Remove truncation of attr names. When attr name length is same in NDB as in MySQL this will be checked in functin check_column_name
| | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-101-1/+2
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug9626 sql/opt_range.cc: Auto merged
| | | | * | | | | | | | valgrind: initialise variable in QUICK_SELECT_Iunknown2005-04-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/opt_range.cc: Initialise number of records in QUICK_SELECT_I
* | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-199-50/+74
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1 sql/field.cc: Auto merged
| * | | | | | | | | | | Change the return type back to int (modify_defaults_file).unknown2005-05-193-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a compilation failure in mysql_com.h, which doesn't have 'uint' alias visibile. Maybe worth while changing to unsigned int, but the rest of functions that work with defaults files return int. include/my_sys.h: Change the return type back to int (modify_defaults_file). include/mysql_com.h: Change the return type back to int (modify_defaults_file). mysys/default_modify.c: Change the return type back to int (modify_defaults_file).
| * | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-193-32/+47
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/5.0.b6961
| | * | | | | | | | | | | a fix (bug #10599: Numeric function 'abs' make server crash).unknown2005-05-193-32/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_func.cc: a fix (bug #10599: Numeric function 'abs' make server crash). Item_func_abs::decimal_op() and Item_func_neg::decimal_op() now return 0 if NULL. Trivial optimization - get rid of an extra jump for common situations.
| * | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-193-9/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/5.0.b6961
| | * | | | | | | | | | | a fix (bug #6961: Traditional: assignment of string to numeric column should ↵unknown2005-05-133-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fail). sql/field.cc: a fix (bug #6961: Traditional: assignment of string to numeric column should fail). Should issue errors in strict modes instead of warnings.
* | | | | | | | | | | | | mergeunknown2005-05-1948-243/+1484
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union mysql-test/mysql-test-run.sh: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/ndb/src/common/util/version.c: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged
| * | | | | | | | | | | | configure.in:unknown2005-05-191-1/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increment to next version. configure.in: Increment to next version.
| * | | | | | | | | | | portablity fixunknown2005-05-192-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-194-11/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * | | | | | | | | | | Fixed references to uninitialized memoryunknown2005-05-192-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sp.cc: Simpe fix to avoid reference to unallocated memory (only opened was needed, but I reset both to make things safer and simpler)
View Lorry Controller Status