Commit graph

18594 commits

Author SHA1 Message Date
unknown
2598faafd7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug10095
2005-05-16 22:21:19 +02:00
unknown
f80fa96d1c Fix memory leak
client/mysql.cc:
  Remove usage of c_ptr_safe() as this causes a linkage problem when compiling MySQL without inline functions
sql/sql_base.cc:
  Don't use c_ptr_safe() on this string as this causes a realloc and the String object (allocated by sql_yacc.yy) is never freed
2005-05-16 20:16:46 +03:00
unknown
259699b4eb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug10221
2005-05-16 14:10:02 +00:00
unknown
4b2020c575 Some improvement in Item_int_with_ref class comment. 2005-05-16 14:06:52 +00:00
unknown
bc933962a3 relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#10020)
mysql-test/r/subselect.result:
  test fro bug 10020
mysql-test/t/subselect.test:
  bug 10020 test suite
sql/item.cc:
  any constant allowed here BUG#10020)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-16 12:19:10 +03:00
unknown
01dfde6faa Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-05-16 02:55:51 +02:00
unknown
94f3584bc7 mysqltest.c:
To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings


client/mysqltest.c:
  To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings
2005-05-16 01:08:42 +02:00
unknown
b11b13e9bd Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/psergey/mysql-4.0-bug10095
2005-05-15 22:58:10 +02:00
unknown
06736ab48a 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.

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.
2005-05-15 22:56:45 +02:00
unknown
8fd8d819d0 mysqltest.c:
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory


mysql-test/mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory
client/mysqltest.c:
  To solve bug#6193, also reset require when using 'eval' for running query
2005-05-15 20:38:54 +02:00
unknown
bea0e79f57 mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
Added option --vardir=<directory> for feature bug#10096


mysql-test/mysql-test-run.pl:
  Added option --vardir=<directory> for feature bug#10096
mysql-test/lib/mtr_process.pl:
  Added option --vardir=<directory> for feature bug#10096
mysql-test/lib/mtr_report.pl:
  Added option --vardir=<directory> for feature bug#10096
2005-05-15 17:22:54 +02:00
unknown
657469bab8 mysql-test-run.pl:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
init_db.sql:
  Initial db updates


mysql-test/lib/init_db.sql:
  Initial db updates
mysql-test/mysql-test-run.pl:
  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
2005-05-15 07:34:09 +02:00
unknown
f4425b50e1 mysqltest.c, mysql-test-run.sh:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
  Use Purify suppress file


mysql-test/suppress.purify:
  Purify suppress file
mysql-test/mysql-test-run.sh:
  Use Purify suppress file
  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
client/mysqltest.c:
  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
2005-05-15 06:59:34 +02:00
unknown
fe302e584e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-14 23:48:15 +02:00
unknown
faa12bf0c7 Fixed compiler failure 2005-05-14 17:08:43 +03:00
unknown
78f2e7b53d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


libmysql/libmysql.c:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
2005-05-14 16:28:52 +03:00
unknown
2059908b9c After merge fixes
BitKeeper/deleted/.del-outfile2.result~fb702ee2518d8e6d:
  Delete: mysql-test/r/outfile2.result
libmysql/libmysql.c:
  Fix indentation for new function mysql_set_character_set()
mysql-test/r/alter_table.result:
  Fix test to be in same order as in 4.0
mysql-test/r/innodb.result:
  After merge fix
mysql-test/r/insert_update.result:
  Add extra test for insert into ... on duplicate key upate
mysql-test/r/outfile.result:
  After merge fix
mysql-test/t/alter_table.test:
  Fix test to be in same order as in 4.0
mysql-test/t/insert_update.test:
  Add extra test for insert into ... on duplicate key upate
mysql-test/t/outfile.test:
  After merge fix
sql/item_func.cc:
  After merge fix
sql/sql_table.cc:
  After merge fix
2005-05-14 16:24:36 +03:00
unknown
ba3540cc69 Fix a valgrind warning: memcpy does not allow its arguments to overlap. 2005-05-14 02:31:26 +04:00
unknown
752372f626 Fix wrong format specifier in error messages.
Not to be pushed into 5.0 as there it's fixed differently (in the new
format of error messages)


sql/share/danish/errmsg.txt:
  Fix wrong format specifier in an error message.
sql/share/serbian/errmsg.txt:
  Fix wrong format specifier in an error message.
2005-05-14 02:28:10 +04:00
unknown
f8bb892314 Fix for BUG#9622: Make index statistics collection in MyISAM behave the same
way in ALTER TABLE ... ENABLE KEYS, ANALYZE TABLE and after bulk insert:
now statistics collection always assumes NULLs are inequal. 


mysql-test/r/myisam.result:
  Testcase for BUG#9622
mysql-test/t/myisam.test:
  Testcase for BUG#9622
2005-05-14 00:21:53 +02:00
unknown
037b0a7b14 Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/outfile2.result:
  Merge rename: mysql-test/r/outfile.result -> mysql-test/r/outfile2.result
myisam/mi_key.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/handler.h:
  Auto merged
mysql-test/t/alter_table.test:
  Merge
mysql-test/t/outfile.test:
  Merge
sql/item_func.cc:
  Merge
sql/share/czech/errmsg.txt:
  Merge
sql/share/danish/errmsg.txt:
  Merge
sql/share/dutch/errmsg.txt:
  Merge
sql/share/english/errmsg.txt:
  Merge
sql/share/estonian/errmsg.txt:
  Merge
sql/share/french/errmsg.txt:
  Merge
sql/share/german/errmsg.txt:
  Merge
sql/share/greek/errmsg.txt:
  Merge
sql/share/hungarian/errmsg.txt:
  Merge
sql/share/italian/errmsg.txt:
  Merge
sql/share/japanese/errmsg.txt:
  Merge
sql/share/korean/errmsg.txt:
  Merge
sql/share/norwegian-ny/errmsg.txt:
  Merge
sql/share/norwegian/errmsg.txt:
  Merge
sql/share/polish/errmsg.txt:
  Merge
sql/share/portuguese/errmsg.txt:
  Merge
sql/share/romanian/errmsg.txt:
  Merge
sql/share/russian/errmsg.txt:
  Merge
sql/share/slovak/errmsg.txt:
  Merge
sql/share/spanish/errmsg.txt:
  Merge
sql/share/swedish/errmsg.txt:
  Merge
sql/share/ukrainian/errmsg.txt:
  Merge
sql/sql_table.cc:
  Merge
sql/sql_yacc.yy:
  Keep old
sql/unireg.cc:
  Merge
2005-05-14 00:01:40 +03:00
unknown
e571163e60 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-13 22:55:08 +02:00
unknown
04890a2e20 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-05-13 23:12:22 +03:00
unknown
cdd6bc9bfe Fixed wrong buffer usage for auto-increment key with blob part that caused CHECK TABLE to report that the table was wrong. (Bug #10045)
myisam/mi_key.c:
  Fixed wrong buffer usage for auto-increment key with blob part that caused
  CHECK TABLE to report that the table was wrong. (Bug #10045)
mysql-test/r/auto_increment.result:
  New test case
mysql-test/t/auto_increment.test:
  New test case
2005-05-13 23:08:29 +03:00
unknown
c3f73a4281 sql/ha_blackhole.cc
bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous lock at read: read lock with no write locks"
sql/sql_base.cc
    libmysqld/examples/mysql.cc linking problem


sql/ha_blackhole.cc:
  bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous lock at read: read lock with no write locks"
sql/sql_base.cc:
  libmysqld/examples/mysql.cc linking problem
2005-05-13 21:43:26 +02:00
unknown
2b5182237c Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-13 10:04:15 -07:00
unknown
c4dcc43e1a Merge mysql.com:/home/jimw/my/mysql-4.1-9603
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-13 10:03:16 -07:00
unknown
c4a1210fd4 row0mysql.c:
InnoDB wrongly complained in the .err log that MySQL is trying to drop a non-existent table, if tablespace ran out (Bug #10607)


innobase/row/row0mysql.c:
  InnoDB wrongly complained in the .err log that MySQL is trying to drop a non-existent table, if tablespace ran out (Bug #10607)
2005-05-13 18:37:22 +03:00
unknown
92cb62c86f added prototype for mysql_set_character_set function 2005-05-13 15:54:35 +02:00
unknown
29f3f4a27f added function mysql_set_character_set (reviewed by Monty)
as a work around for #8317 and #9637

This function sends SET NAMES command and changes mysql->charset
so mysql_real_escape_string will work as expected.


libmysql/libmysql.def:
  added new function mysql_set_character_set
2005-05-13 15:06:11 +02:00
unknown
2a695127a6 Fixes during review
mysql-test/r/select.result:
  Better error message
mysql-test/t/select.test:
  Better error message
sql/hostname.cc:
  Join identical code
sql/sql_yacc.yy:
  Combine code (and get a better error message)
strings/ctype-ucs2.c:
  Cast pointer differencess
2005-05-13 14:04:32 +03:00
unknown
89ef3990d9 readline.h:
Include <sys/ttydefaults.h> for CodeWarrior and CTRL define


cmd-line-utils/libedit/readline/readline.h:
  Include <sys/ttydefaults.h> for CodeWarrior and CTRL define
2005-05-13 11:59:17 +02:00
unknown
7c441dd115 Change create_field->offset to store offset from start of fields, independent of null bits.
Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236


mysql-test/r/alter_table.result:
  More test for bug #6236 (CREATE TABLE didn't properly count not null columns for primary keys)
mysql-test/t/alter_table.test:
  More test for bug #6236 (CREATE TABLE didn't properly count not null columns for primary keys)
sql/handler.h:
  Add counter for null fields
sql/sql_table.cc:
  Change create_field->offset to store offset from start of fields, independent of null bits.
  Count null_bits separately from field offsets and adjust them in case of primary key parts.
sql/unireg.cc:
  Change create_field->offset to store offset from start of fields, independent of null bits.
  Count null_bits separately from field offsets and adjust them in case of primary key parts.
2005-05-13 11:11:50 +03:00
unknown
420e480e01 - don't include sys.h directly in the autogenerated libedit source
files - include config.h instead (compile fix for FreeBSD and AIX
  4.3/5.2)


cmd-line-utils/libedit/makelist.sh:
  - don't include sys.h directly in the autogenerated files - include
    config.h instead (compile fix for FreeBSD and AIX 4.3/5.2)
2005-05-13 10:04:35 +02:00
unknown
c322164a2c readline.c:
Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2
search.c:
  FreeBSD needs <sys/types.h> to get 'off_t' defined


cmd-line-utils/libedit/search.c:
  FreeBSD needs <sys/types.h> to get 'off_t' defined
cmd-line-utils/libedit/readline.c:
  Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2
2005-05-12 19:02:26 +02:00
unknown
c4c1979dbf - added a check for "u_int32_t" to configure.in that will define
HAVE_U_INT32_T when available (needed to fix a double typedef in
  libedit)


configure.in:
  - added a check for "u_int32_t" that will define HAVE_U_INT32_T
    when available (needed to fix a double typedef in libedit)
2005-05-12 18:18:37 +02:00
unknown
cbbc4ff6a2 If the system is under high load 'show full processlist' might report the
process of the predecessing test case instead of the current test case. 
Shifting the command to the end of the current test case should avoid this problem. 


mysql-test/r/ps_grant.result:
  Updated result
mysql-test/t/ps_grant.test:
  Shift ' show full processlist ' to the end of the test script
2005-05-12 17:49:34 +02:00
unknown
3910cf81bc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-12 11:12:04 +02:00
unknown
913e2e12d2 mysqldump.1.in:
Remove obsolete section number. (Bug #10534)


man/mysqldump.1.in:
  Remove obsolete section number. (Bug #10534)
2005-05-11 12:14:46 -05:00
unknown
0f436b32f1 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-10 18:14:45 +02:00
unknown
73a49cf1c9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-10 17:52:17 +02:00
unknown
4c2265b0ae Fix for Ingo
BUILD/check-cpu:
  Set old_flag to pentium
2005-05-10 17:51:29 +02:00
unknown
d601b84538 Applied two patches already commited to the main tree to resolve bugs found during the build:
- removed an "#error PRAGMA" from sql/item_strfunc.h (msvensson)
 - Fixed BUG#10070 (range test failed if InnoDB is not available) (sergefp)


mysql-test/t/range.test:
  Fix for BUG#10070: Make the test not to produce warnings if InnoDB is not available
sql/item_strfunc.h:
  Remove the testcode
2005-05-10 14:44:03 +02:00
unknown
5afb72220d ctype-big5.c:
additional fix for bug@10493, for sjis
ctype-cp932.c:
  additional fix for bug#10493, for cp932


strings/ctype-cp932.c:
  additional fix for bug#10493, for cp932
strings/ctype-big5.c:
  additional fix for bug@10493, for sjis
2005-05-10 17:00:54 +05:00
unknown
a862ef73ae Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/cw/mysql-4.1


configure.in:
  Auto merged
2005-05-10 13:56:08 +02:00
unknown
05a945ecf4 Makefile.am, configure.in:
Enable creation of embedded lib when --with-darwin-mwcc


configure.in:
  Enable creation of embedded lib when --with-darwin-mwcc
libmysqld/Makefile.am:
  Enable creation of embedded lib when --with-darwin-mwcc
2005-05-10 13:53:47 +02:00
unknown
d4432343d1 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/root/mysql-4.1
2005-05-10 14:24:58 +05:00
unknown
a91cf275c8 bug#10344: some string function fail for UCS2
substr fix
2005-05-10 14:13:58 +05:00
unknown
d7e49743e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-10 10:45:49 +02:00
unknown
31d7922823 Remove testcode
sql/item_strfunc.h:
  Remove the testcode
2005-05-10 10:45:16 +02:00