summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup for lost file descriptors on close table for ha_archive. unknown2005-01-282-11/+16
| | | | | | | sql/examples/ha_archive.cc: More comments, fixed issue with lost file descriptors. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-192-3/+19
|\ | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| * added possibility to add extra opts to ndbd and ndb_mgmd in mysql-test-rununknown2005-01-192-3/+19
| |
* | bug#7693 - ndb unknown2005-01-194-8/+41
|/ | | | | | | | | | | | | | | when using shm transporter, set sigmask on each thread using pthread_sigmask configure.in: Add more functions needed for SHM ndb/src/common/portlib/NdbThread.c: 1) Create thread wrapper function 2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER ndb/src/common/transporter/TransporterRegistry.cpp: (un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER sql/ha_ndbcluster.cc: cast pointer to UintPtr before printout
* Merge bk-internal:/home/bk/mysql-4.1unknown2005-01-183-4/+27
|\ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-183-4/+27
| |\ | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1
| | * fixing wrong value for "examined rows" when UNION's are used.unknown2005-01-183-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/union.result: result for a test case for the wrong examined rows with UNION's mysql-test/t/union.test: test case for the wrong examined rows with UNION's sql/sql_union.cc: a patch for the wrong examined rows with UNION's
* | | Update type_float test results after merge.unknown2005-01-181-7/+9
| | | | | | | | | | | | | | | | | | mysql-test/r/type_float.result: Update test results (4.1 produces a warning that 4.0 did not, and they were merged into the wrong position).
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-6913unknown2005-01-181-1/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * | | Print a warning when an old table (with no character set stored) is openedunknown2005-01-171-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and the default character set is multi-byte, which will result in character column size changes. (Bug #6913) sql/table.cc: Print a warning when an old table is opened and the default character set is multi-byte that warns about character column sizes possibly getting changed
* | | | Merge changed testsunknown2005-01-183-0/+15
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | sql/field_conv.cc: Auto merged mysql-test/r/type_float.result: Merge mysql-test/t/type_float.test: Merge
| * | | Merge mysql.com:/home/jimw/my/mysql-4.0-7700unknown2005-01-183-0/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.0-clean
| | * | | Fix over-optimization that could result in an unsigned double field beingunknown2005-01-173-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set to a negative value. (Bug #7700) sql/field_conv.cc: Don't treat real fields as identical when destination is unsigned and the source is not. mysql-test/t/type_float.test: Add test for setting double unsigned to a negative value from a signed double mysql-test/r/type_float.result: Add test results
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-183-17/+5
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-merges
| * | | | Cleanups in Makefile.amsunknown2005-01-183-17/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/Makefile.am: Remove explicit _DEPENDENCIES, they are not needed with automatic dependency tracking wich we started using several months ago. Don't use relative paths in makefiles. regex/Makefile.am: Remove explicit _DEPENDENCIES, they are not needed with automatic dependency tracking wich we started using several months ago. Don't use relative paths. strings/Makefile.am: Remove dead rule.
* | | | | Added test for bug #7884 "Able to add invalid unique index on TIMESTAMPunknown2005-01-182-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prefix", which roots were fixed in 4.0 tree. mysql-test/r/alter_table.result: Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP prefix". mysql-test/t/alter_table.test: Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP prefix".
* | | | | Manual merge of fix for bug #7884 "Able to add invalid unique index onunknown2005-01-181-7/+7
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | TIMESTAMP prefix" into 4.1 tree. sql/field.h: Manual merge.
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-01-181-7/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.0-bg7884
| | * | | Clean up in implementation of f_is_geom()/f_is_bitfield()/f_is_enum()unknown2005-01-181-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | macros. It does not fixes any bugs in 4.0. But it prevents from future error in any bugfixes that may use these macros. Also after merging into 4.1 tree this cleanup will fix bug #7884 "Able to add invalid unique index on TIMESTAMP prefix". sql/field.h: Since FIELDFLAG_INTERVAL, FIELDFLAG_BITFIELD, FIELDFLAG_BLOB and FIELDFLAG_GEOM flags occupy the same space as number of decimals for FIELDFLAG_NUMBER fields, it is safer to check in "f_is_geom()"-type macros that we have non-number field, like we already do in f_is_blob() macro.
| * | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-01-181-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
* | | | | | 1. Item now uses my_charset_bin by default,unknown2005-01-1813-56/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not default_charset_into. It fixes the problem that in some cases numbers where treated as CHAR(N), not as BINARY(N), e.g. wrong 'charsetnr' when sent to the client side. 2. IFNULL didn't aggregate argument charsets and collations, so IFNULL(1,'a') produced a CHAR(N). Now produces a BINARY(N). 3. SELECT PROCEDURE ANALIZE now returns BINARY columns, which is much better than it worked previously: CHAR with the default character set. But in the future it's worth to fix the fields 'Field_name' and 'Optimal_fieldtype' to use UTF8, and 'Min_value' and 'Max_value' to inherit their charsets from the original items. But it is not important, and BINARY(N) is OK for now. 4. Tests were fixed accordingly. No new tests were made, as the old onces cover everything. mysql-test/r/analyse.result: SELECT PROCEDURE ANALIZE now returns BINARY columns, which is much better than it worked previously: CHAR with the default character set. But in the future it's worth to fix the fields 'Field_name' and 'Optimal_fieldtype' to use UTF8, and 'Min_value' and 'Max_value' to inherit their charsets from the original items. But it is not important, and BINARY(N) is OK for now. mysql-test/r/case.result: Test fix according to the changes mysql-test/r/metadata.result: Test fix according to the changes mysql-test/r/ps_1general.result: Test fix according to the changes mysql-test/r/ps_2myisam.result: Test fix according to the changes mysql-test/r/ps_3innodb.result: Test fix according to the changes mysql-test/r/ps_4heap.result: Test fix according to the changes mysql-test/r/ps_5merge.result: Test fix according to the changes mysql-test/r/ps_6bdb.result: Test fix according to the changes mysql-test/r/ps_7ndb.result: Test fix according to the changes mysql-test/r/union.result: Test fix according to the changes sql/item.cc: Item is now BINARY by default sql/item_cmpfunc.cc: IFNULL now collects arguments collations/charsets like other functions do.
* | | | | | Fix 'make distclean' goal.unknown2005-01-181-1/+1
| | | | | |
* | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-181-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-clean
| * \ \ \ \ \ Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-187-6/+41
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-clean
| * | | | | | | Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'":unknown2005-01-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Working around hang of master < 3.23.50 on SELECT @@unknown_var (to enable 3.23.49->4.1.10 replication) sql/slave.cc: Working around hang of master < 3.23.50 on SELECT @@unknown_var (to enable 3.23.49->4.1.10 replication)
* | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-1810-7/+52
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| * | | | | | | #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literalsunknown2005-01-183-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not overwrite res if it is returned from a const item.
| * | | | | | | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1unknown2005-01-181-0/+3
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | sql/filesort.cc: Auto merged
| | * | | | | | Anoter fix for moved IO_CACHE objectunknown2005-01-181-0/+3
| | | | | | | |
| * | | | | | | Fixed new bug that caused symlink test to failunknown2005-01-182-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/my_symlink.c: More debugging
| * | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2005-01-181-1/+5
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
| | * | | | | | backported from 5.0 patch initialization of main select for commands where ↵unknown2005-01-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subqueries are possible
| * | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-173-1/+11
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bob.(none):/home/reggie/bk/mysql-4.1 BitKeeper/etc/logging_ok: auto-union client/mysql.cc: Auto merged
| | * | | | | | Bug #7966 query cache doesn't work properly with batch statementsunknown2005-01-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql_lex.cc: Set query to not cacheable if we are using multistatements and there are multiple statements in this query sql/sql_lex.cc: Set query to not cacheable if we are using multistatements and there are multiple statements in this query
| | * | | | | | Bug #7922 prompt \p fails on Windows for shared-memory connectionsunknown2005-01-152-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt. mysql.cc: Added code to display mysql.host as prompt when using shared memory client/mysql.cc: Added code to display mysql.host as prompt when using shared memory BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| * | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | * \ \ \ \ \ \ Merge mysql.com:/space/my/mysql-4.0unknown2005-01-171-1/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build Build-tools/Do-pkg: Auto merged
| | | * | | | | | - Enabled the handling of architecture extensions e.g. "-64bit" when buildingunknown2005-01-171-1/+1
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac OS X PKGs with Do-pkg Build-tools/Do-pkg: - enable handling of architecture extensions e.g. "-64bit"
* | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-172-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
| * | | | | | | Fixed memory leak in handle_local_infile()unknown2005-01-172-0/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-177-21/+112
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
| * | | | | | Merge mysql.com:/home/timka/mysql/src/4.1-virginunknown2005-01-171-14/+19
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/timka/mysql/src/4.1-bug-7331
| | * \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-171-14/+19
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | * | | | | Bug#7937unknown2005-01-171-14/+19
| | | | | | | |
| * | | | | | | Merge mysql.com:/home/timka/mysql/src/4.1-virginunknown2005-01-173-4/+89
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/timka/mysql/src/4.1-bug-7331 sql/sql_select.cc: Auto merged
| | * | | | | | Fix for BUG#7331.unknown2005-01-063-4/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when a QUICK_SELECT access method is chosen, test_if_skip_sort_order() discovered that the index being used by the quick select will not deliver tuples in sorted order. In this case test_if_skip_sort_order() tried to change the index used by the quick select, but it didn't properly set the other members of the quick select, and especially the range flags of the ranges in QUICK_SELECT::ranges. The fix re-invokes the function SQL_SELECT::test_quick_select to correctly create a valid QUICK_SELECT object. mysql-test/r/order_by.result: Added test results. mysql-test/t/order_by.test: Added test for BUG#7331. sql/sql_select.cc: Fix for BUG#7331.
| * | | | | | | user_var.result, func_str.result, item_strfunc.cc:unknown2005-01-173-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug#7839 ncorrect collation for char(ascii('a')) sql/item_strfunc.cc: bug#7839 ncorrect collation for char(ascii('a')) mysql-test/r/func_str.result: bug#7839 ncorrect collation for char(ascii('a')) mysql-test/r/user_var.result: bug#7839 ncorrect collation for char(ascii('a'))
* | | | | | | | mysqldump.c:unknown2005-01-171-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move out-of-order option. client/mysqldump.c: Move out-of-order option.
* | | | | | | libmysql.c:unknown2005-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug#7891: mysql_character_set_name() returns collation libmysql/libmysql.c: bug#7891: mysql_character_set_name() returns collation
View Lorry Controller Status