summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed memory reference errors found by valgrindunknown2005-01-1215-39/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_federated.cc: Change mode to -rw-rw-r-- myisam/mi_create.c: Ensure that all referenced memory is reset mysql-test/r/type_timestamp.result: More tests mysql-test/t/func_compress.test: Added comment mysql-test/t/type_timestamp.test: More tests sql/field.h: Count number of varchars in table sql/item_cmpfunc.cc: Safety fix (to avoid warning from valgrind) sql/opt_range.cc: Simple optimzation sql/sql_acl.cc: Safety fix (to avoid warning from valgrind) sql/sql_parse.cc: Safety fix for prepared statements sql/sql_show.cc: Move variable declarations first in function Remove hidden variable (it) Remove accessing freed memory (table_list->table_name) sql/sql_update.cc: Compare records with varchars correctly sql/table.cc: Safety fix when running with purify/valgrind Fix wrong memory reference in case of errors sql/table.h: Added counting of varchar fields strings/ctype-mb.c: Fill max_str properly
* merge unknown2005-01-101-11/+10
|\
| * bug#7761 - ndb does not autcommit - postreview fixesunknown2005-01-101-7/+4
| | | | | | | | | | sql/sql_table.cc: Move ha_enable to before new Copy, to ensure no memory is leaked
| * Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-101-11/+13
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | * bug#7761 - ndb does not autocommit during alter tableunknown2005-01-101-11/+13
| | | | | | | | | | | | | | | sql/sql_table.cc: Turn off transactions before locking (as locking will need to know)
* | | Merge mysql.com:/home/jonas/src/mysql-5.0-ndbunknown2005-01-098-18/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0
| * \ \ Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1unknown2005-01-081-1/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0 sql/set_var.cc: Auto merged
| | * | set_var.cc:unknown2005-01-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whack duplicate variable line. (Affects SHOW VARIABLES.) sql/set_var.cc: Whack duplicate variable line. (Affects SHOW VARIABLES.)
| | * | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-0816-66/+306
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
| * | | | sql_select.cc:unknown2005-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | silence picky compiler warning. sql/sql_select.cc: silence picky compiler warning.
| * | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-081-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0 mysql-test/r/type_float.result: Auto merged sql/field.cc: Auto merged
| | * \ \ \ Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1unknown2005-01-071-2/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0 sql/set_var.cc: Auto merged
| | | * | | set_var.cc:unknown2005-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorder variables to properly alphabetize SHOW VARIABLES output. sql/set_var.cc: Reorder variables to properly alphabetize SHOW VARIABLES output.
| | * | | | Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1unknown2005-01-074-34/+84
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0 mysql-test/r/type_float.result: Auto merged sql/field.cc: Auto merged
| * | | | | Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-0817-38/+323
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jwinstead2/mysql-5.0-clean
| * | | | | | Update test as result of mergeunknown2005-01-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/heap.result: update test
| * | | | | | Merge mysql.com:/home/jwinstead2/mysql-4.1-7233unknown2005-01-085-11/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jwinstead2/mysql-5.0-clean mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/sql_mode.result: Auto merged mysql-test/t/show_check.test: Auto merged sql/sql_show.cc: Auto merged
| | * | | | | | Use 'USING <indextype>' in results of SHOW CREATE TABLE, it's the preferredunknown2005-01-085-11/+11
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syntax. (Bug #7233) sql/sql_show.cc: Use 'USING <indextype>' in SHOW CREATE TABLE, it's the preferred syntax mysql-test/r/ctype_utf8.result: Update results mysql-test/r/show_check.result: Update results mysql-test/r/sql_mode.result: Update results mysql-test/t/show_check.test: Use preferred syntax 'USING BTREE' instead of 'TYPE BTREE'
* | | | | | | ndb -unknown2005-01-093-41/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ndb_limit, handle cmpDate of length 3 Remove ucs2 test as it requires one to configure --with-extra-charsets mysql-test/r/ndb_charset.result: Remove ucs2 test as it requires one to configure --with-extra-charsets mysql-test/t/ndb_charset.test: Remove ucs2 test as it requires one to configure --with-extra-charsets ndb/src/common/util/NdbSqlUtil.cpp: Fix ndb_limit, handle cmpDate of length 3
* | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-01-0935-414/+878
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0-ndb
| * | | | | | | ndb - wl-1442 merge fix 5.0 -> 5.0-ndbunknown2005-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/util/NdbSqlUtil.hpp: wl-1442 merge fix 5.0 -> 5.0-ndb
| * | | | | | | Mergeunknown2005-01-0922-81/+398
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/NdbDictionary.cpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged ndb/include/ndb_constants.h: merge 5.0->5.0-ndb ndb/include/kernel/signaldata/DictTabInfo.hpp: merge 5.0->5.0-ndb ndb/include/ndbapi/NdbDictionary.hpp: merge 5.0->5.0-ndb ndb/include/util/NdbSqlUtil.hpp: merge 5.0->5.0-ndb ndb/src/common/util/NdbSqlUtil.cpp: merge 5.0->5.0-ndb
| | * | | | | | ndb - wl-1442 4.1->5.0 merge fixesunknown2005-01-084-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/kernel/signaldata/DictTabInfo.hpp: wl-1442 4.1->5.0 merge fixes ndb/include/ndb_constants.h: wl-1442 4.1->5.0 merge fixes ndb/include/util/NdbSqlUtil.hpp: wl-1442 4.1->5.0 merge fixes ndb/src/common/util/NdbSqlUtil.cpp: wl-1442 4.1->5.0 merge fixes
| | * | | | | | Mergeunknown2005-01-0816-35/+316
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Auto merged mysql-test/r/ndb_index_ordered.result: Auto merged mysql-test/t/ndb_index_ordered.test: Auto merged ndb/src/ndbapi/NdbDictionary.cpp: Auto merged ndb/include/kernel/signaldata/DictTabInfo.hpp: merge ndb/include/ndbapi/NdbDictionary.hpp: merge ndb/include/util/NdbSqlUtil.hpp: merge ndb/src/common/util/NdbSqlUtil.cpp: merge ndb/src/ndbapi/NdbDictionaryImpl.cpp: merge sql/ha_ndbcluster.cc: merge
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-084-6/+11
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
| | | | * | | | few harmless warnings from automated code-checking tools fixedunknown2005-01-084-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: few harmless warnings from automated code-checking tools fixed cleanup
| | | * | | | | Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-0811-59/+294
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jwinstead2/mysql-4.1-clean
| | | | * | | | ndb - wl-1442 fix Time orderingunknown2005-01-0811-4/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_index_ordered.result: wl-1442 fix Time. adds new type id 25 mysql-test/t/ndb_index_ordered.test: wl-1442 fix Time. adds new type id 25 ndb/include/kernel/signaldata/DictTabInfo.hpp: wl-1442 fix Time. adds new type id 25 ndb/include/ndbapi/NdbDictionary.hpp: wl-1442 fix Time. adds new type id 25 ndb/include/util/NdbSqlUtil.hpp: wl-1442 fix Time. adds new type id 25 ndb/src/common/util/NdbSqlUtil.cpp: wl-1442 fix Time. adds new type id 25 ndb/src/ndbapi/NdbDictionary.cpp: wl-1442 fix Time. adds new type id 25 ndb/src/ndbapi/NdbDictionaryImpl.cpp: wl-1442 fix Time. adds new type id 25 ndb/test/include/NdbSchemaOp.hpp: wl-1442 fix Time. adds new type id 25 ndb/tools/restore/consumer.cpp: wl-1442 fix Time. adds new type id 25 sql/ha_ndbcluster.cc: wl-1442 fix Time. adds new type id 25
| | | | * | | | ndb - wl-1442 fix Date orderingunknown2005-01-0811-67/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_index_ordered.result: wl-1442 fix Date. reuses old unused Timespec type id mysql-test/t/ndb_index_ordered.test: wl-1442 fix Date. reuses old unused Timespec type id ndb/include/kernel/signaldata/DictTabInfo.hpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/include/ndbapi/NdbDictionary.hpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/include/util/NdbSqlUtil.hpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/src/common/util/NdbSqlUtil.cpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/src/ndbapi/NdbDictionary.cpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/src/ndbapi/NdbDictionaryImpl.cpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/test/include/NdbSchemaOp.hpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/tools/restore/consumer.cpp: wl-1442 fix Date. reuses old unused Timespec type id sql/ha_ndbcluster.cc: wl-1442 fix Date. reuses old unused Timespec type id
| | | | * | | | ndb - wl-1442 updated ndb_index_ordered.resultunknown2005-01-081-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_index_ordered.result: wl-1442 missed result file
| | | | * | | | ndb - wl-1442 bug#7725 datetime orderingunknown2005-01-082-14/+39
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/ndb_index_ordered.test: wl-1442 datetime ordering ndb/src/common/util/NdbSqlUtil.cpp: wl-1442 datetime ordering
| | | * | | | Fix unportable 'tr' usage in libedit build process. (Bug #7669)unknown2005-01-081-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmd-line-utils/libedit/makelist.sh: Spell out the character range for braindead versions of tr (like /usr/xpg4/bin/tr on Sun Solaris 2.10)
| | * | | | Update messages in type_float test resultsunknown2005-01-072-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/type_float.result: Update warning messages mysql-test/r/type_float.result.es: Update warning messages
| | * | | | Create columns_priv with correct column lengths (the alter tableunknown2005-01-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that used to fix it was removed in a merge, and now the alter table that fixes the length comes before the create table so it fixes pre-existing tables but not the newly-created one). scripts/mysql_fix_privilege_tables.sql: Create columns_priv with correct column lengths
| | * | | | Merge mysql.com:/home/jwinstead2/mysql-4.1-cleanunknown2005-01-074-34/+84
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jwinstead2/mysql-5.0-clean mysql-test/r/type_float.result: Auto merged sql/field.cc: Auto merged
| | | * | Correctly truncate integers inserted into field and double columnsunknown2005-01-074-34/+84
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with a number of decimals specified. (Bug #7361) mysql-test/t/type_float.test: Add test for maximum values of float and double columns with number of decimals mysql-test/r/type_float.result: Add results for new test mysql-test/r/type_float.result.es: Add results for new test sql/field.cc: Use ::store(double nr) from ::store(longlong nr) so we get the same range checking
| * | | updated some mgmapi docsunknown2005-01-092-9/+21
| | | |
| * | | ndb_constants.h:unknown2005-01-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wl-1442 comment for 4.1->5.0 ndb/include/ndb_constants.h: wl-1442 comment for 4.1->5.0
| * | | Ndb.hpp: Fixed some typos and added note unknown2005-01-091-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about parallelism (Guide section). ndb/include/ndbapi/Ndb.hpp: Fixed some typos and added note about parallelism (Guide section).
| * | | Merge jstephens@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-01-093-105/+200
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gigan.:C:/cygwin/home/bk/mysql-5.0-ndb ndb/include/ndbapi/Ndb.hpp: Auto merged
| | * \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-01-083-105/+200
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb ndb/include/ndbapi/Ndb.hpp: Auto merged
| | | * | | fixed some mgmapi docsunknown2005-01-083-105/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added example to ndbapi docs ndb/include/mgmapi/mgmapi.h: fixed some mgmapi docs ndb/include/ndbapi/Ndb.hpp: added examples ndb/src/mgmapi/mgmapi.cpp: removed unused parameter
| * | | | | More documentation fixes/edits to Ndb.hpp (NDB unknown2005-01-091-54/+59
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Programmers Guide section.) ndb/include/ndbapi/Ndb.hpp: More fixes/edits (finished NDB Programmers Guide section.)
| * | | | Merge jstephens@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-01-081-89/+79
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | into gigan.:C:/cygwin/home/bk/mysql-5.0-ndb
| | * | | First round of edits to Ndb.hpp for Alcatel PDF.unknown2005-01-081-89/+79
| | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/ndbapi/Ndb.hpp: Edits for Alcatel PDF version (first set).
| * | | | Merge bk-internal:/home/bk/mysql-5.0-ndbunknown2005-01-082-6/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/tulin/mysql-5.0-ndb
| | * \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-01-082-6/+21
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| | | * | | fixed some missing references in the ndbapi docs for events and dictionaryunknown2005-01-082-6/+21
| | | | | |
| * | | | | Merge bk-internal:/home/bk/mysql-5.0-ndbunknown2005-01-081-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/tulin/mysql-5.0-ndb
| | * | | | Testing a new @ref in Ndb.hpp.unknown2005-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/ndbapi/Ndb.hpp: Testing a ref.