summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* UCS2 support in ENUM and SET, which also fixes:unknown2004-12-068-23/+170
| | | | | | | | Bug #5174 SHOW CREATE TABLE hangs up if the table contains half-with katakana enum values UCS2 values are stored in HEX encoding in FRM file
* Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-064-12/+28
|\ | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5823 sql/sql_parse.cc: Auto merged
| * A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet).unknown2004-12-064-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | scripts/fill_help_tables.sh: percent_xxx variables added to avoid /0 error. scripts/mysql_install_db.sh: A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet). --net_buffer_length=16K added. sql/net_serv.cc: Typo fixed. sql/sql_parse.cc: A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet). Auto extend net buffer in bootstrap mode.
* | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-064-9/+41
|\ \ | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
| * \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-064-9/+41
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
| | * | Syntax extention: 'ALTER DATABASE' without db name (after review)unknown2004-12-064-9/+41
| | | |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-12-062-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-12-062-1/+3
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-12-062-1/+3
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | * | help text correctedunknown2004-12-041-1/+1
| | | | |
| | | * | compatibility fix (2G filesize limit)unknown2004-12-031-0/+2
| | | | |
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-061-24/+87
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/rburnett/mysql-4.1-new2
| * | | | Bug #6697 Failure to build 4.1.7 on Visual Studio .NET [fixed]unknown2004-12-021-24/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqld.dsp: Added custom build step for message.mc to all targets VC++Files/sql/mysqld.dsp: Added custom build step for message.mc to all targets
* | | | | New fix for bug#6796 Wrong outcome of update operation of ndb tableunknown2004-12-061-3/+2
| | | | |
* | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-063-1/+37
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1 sql/sql_update.cc: Auto merged
| * | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-0254-161/+23766
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
| * \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-013-1/+37
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
| | * \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-303-1/+53
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
| | * \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-303-1/+37
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
| | | * | | | | | Added better test for Bug #6794 Wrong outcome of update operation of ndb tableunknown2004-11-282-4/+5
| | | | | | | | |
| | | * | | | | | Fix for Bug #6794 Wrong outcome of update operation of ndb tableunknown2004-11-283-1/+36
| | | | | | | | |
* | | | | | | | | Fixed thar proper charset was not set in Field_set::val_str()unknown2004-12-067-28/+29
| | | | | | | | |
* | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-062-3/+37
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 configure.in: Auto merged
| * | | | | | | | wixed ndb-debug option for configureunknown2004-12-062-9/+9
| | | | | | | | |
| * | | | | | | | added configure option to control extra ndb debug options,unknown2004-12-032-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for release debug build please configure with --without-ndb-debug
* | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-061-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1 configure.in: Auto merged
| * | | | | | | | | configure.in:unknown2004-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | latin1_spanish_ci produced unknown collation error. configure.in: latin1_spanish_ci produced unknown collation error.
* | | | | | | | | | Integrate suggestions from Tomas Ulin's mail. (r.e. reporting an error in ↵unknown2004-12-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the case of endianness mismatch). ndb/src/mgmsrv/Services.cpp: - initialise endian= 0; args.get will not set if not found - change error message to be clearer
* | | | | | | | | | Add (optional) endian parameter to 'get nodeid' to warn on endian conflicts.unknown2004-12-063-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/mgmapi/mgmapi.cpp: Send an extra (optional) parameter to 'get nodeid' to detect potential endianness conflicts. endian: big endian: small Server will deny our nodeid request if we're not compatible. If parameter is not specified, we behave how we used to (work or fail). ndb/src/mgmsrv/Services.cpp: Add extra (optional) parameter to 'get nodeid' to detect potential endianness conflicts. endian: big endian: little we will deny the nodeid request if the endian parameter is provided and the endian doesn't match. This should preserve compatibility with all clients. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | | | | | | ndb: fix solaris (etc) ndb startup problem in mysql-test-rununknown2004-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/common/util/NdbOut.cpp: avoid printf("%s", (char*)0)
* | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/bXXXX-4.1unknown2004-12-042-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Due to a compiler bug, slave.cc:tables_ok() sometimes wrongly returnsunknown2004-12-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1 if the return type is int or int_fast8_t. The test case that showed this problem is rpl000001 and the tested version was MySQL 5.0.2. The compiler with the problem is GCC 3.0.4 runing on "Linux bitch 2.4.18 #2 Thu Apr 11 14:37:17 EDT 2002 sparc64 unknown". By changing the return type to bool the problem disappear. (Another way to make the problem disappear is to simply print the returned value with printf("%d",?). The printed returned value is always 0 in the test cases I have run.) This is only a partial solution to the problem, since someone could later change the return type of the function back to int or some other type that does not work. sql/slave.cc: Changed type sql/slave.h: Changed type
* | | | | | | | | | | postreview fixesunknown2004-12-042-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect_innodb.result: fixed result of test mysql-test/t/subselect_innodb.test: fixed test layout
* | | | | | | | | | | mergeunknown2004-12-033-3/+16
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2004-12-033-3/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
| | * | | | | | | | | | init values to avoid junk returning in case of null value asking without ↵unknown2004-11-253-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assigning value (BUG#6806) mysql-test/r/subselect.result: Equal operation under row and empty subquery mysql-test/t/subselect.test: Equal operation under row and empty subquery sql/item.h: init values to avoid junk returning in case of null value asking without assigning value
* | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2004-12-0397-379/+24665
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1 sql/sql_class.h: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged
| * | | | | | | | | | | Fix t/rpl_create_database.test: replace version in SHOW BINLOG RESULTSunknown2004-12-032-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/rpl_create_database.test: need to replace version in results mysql-test/r/rpl_create_database.result: version gets replaced
| * | | | | | | | | | | Mergeunknown2004-12-0330-155/+630
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_class.h: SCCS merged
| | * \ \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-032-27/+19
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-12-032-27/+19
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | | * \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-12-032-27/+19
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/sql_insert.cc: Auto merged
| | | | | * | | | | | | | | sql/sql_class.hunknown2004-12-032-27/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part sql/sql_insert.cc Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part sql/sql_class.h: Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part sql/sql_insert.cc: Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
| | * | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-031-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | | * | | | | | | | | | | Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2004-12-031-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | | | * | | | | | | | | | | ndb - fix in test suiteunknown2004-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/test/src/NDBT_Test.cpp: clear threads when finished waiting
| | * | | | | | | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-031-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my41
| | | * | | | | | | | | | | | ndb: failed update updated tuple version. crash at DbtupTrigger.cpp 1102unknown2004-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: failed update updated tuple version. crash at DbtupTrigger.cpp 1102
| | * | | | | | | | | | | | | Merge mysql.com:/home/wax/mysql/mysql-4.1unknown2004-12-033-0/+255
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/wax/mysql/mysql-4.1testtemp
| | | * | | | | | | | | | | | added project files of mysqltest and mysql_test_run_newunknown2004-12-033-0/+255
| | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |