Commit graph

20142 commits

Author SHA1 Message Date
unknown
27fb23c6eb Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
2006-01-27 13:11:58 -05:00
unknown
7f3f9027d9 Added comments to specify why no much mutex is needed. 2006-01-27 12:44:33 -05:00
unknown
79f575a8f7 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
2006-01-27 09:29:59 -05:00
unknown
67b1ea2486 configure.in:
Cloned off 4.1.18, new release number 4.1.19


configure.in:
  New release number
2006-01-27 12:10:40 +01:00
unknown
5681e7f657 configure.in:
Generated "libmysql.ver" will be in \$(top_builddir)


configure.in:
  Generated "libmysql.ver" will be in \$(top_builddir)
2006-01-27 01:38:05 +01:00
unknown
e7f4df036b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
2006-01-26 19:01:54 +02:00
unknown
54d7c6c596 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
2006-01-26 16:59:34 +02:00
unknown
f9ab554985 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1


sql/sql_select.cc:
  Auto merged
2006-01-26 16:00:49 +02:00
unknown
e0412c55b3 BUG#16487 importing the test case from 5.0 (the fix is done in BUG#15699)
mysql-test/t/rpl_ignore_table-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_ignore_table-slave.opt''
mysql-test/t/rpl_ignore_table.test:
  New BitKeeper file ``mysql-test/t/rpl_ignore_table.test''
2006-01-26 12:51:34 +02:00
unknown
956a5b6dfa BUG#15699 importing the fix from 5.0
sql/sql_parse.cc:
  BUG#15699,16487 merge of the fix made in 5.0
mysql-test/r/rpl_multi_update4.result:
  New BitKeeper file ``mysql-test/r/rpl_multi_update4.result''
mysql-test/t/rpl_multi_update4-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_multi_update4-slave.opt''
mysql-test/t/rpl_multi_update4.test:
  New BitKeeper file ``mysql-test/t/rpl_multi_update4.test''
mysql-test/r/rpl_ignore_table.result:
  New BitKeeper file ``mysql-test/r/rpl_ignore_table.result''
2006-01-26 12:49:55 +02:00
unknown
4c6d256b90 reserved config numbers in ndb 2006-01-26 10:16:28 +01:00
unknown
7dd2ec0f1b BUG#15935: post-review fixes: added comment 2006-01-26 00:09:04 +03:00
unknown
6025cd4672 Merge 2006-01-26 00:06:20 +03:00
unknown
042d5c1a18 sql_base.cc:
Small fix after merge of fix for bug#16510


sql/sql_base.cc:
  Small fix after merge of fix for bug#16510
2006-01-25 23:28:39 +03:00
unknown
d33ac37ba6 BUG#15935: In mysql_update, don't use full index scan when we could have used quick select scan.
mysql-test/r/update.result:
  Testcase for BUG#15935
mysql-test/t/update.test:
  Testcase for BUG#15935
sql/sql_update.cc:
  BUG#15935: 
  - Do account for the fact that used_index!=MAX_KEY is also true for cases
    when quick select is used, and use quick select then (and not full index scan).
  - Also removed the redundant "used_index= MAX_KEY" statement
2006-01-25 23:25:23 +03:00
unknown
4a525b3f92 Manually merged
sql/sql_base.cc:
  Auto merged
2006-01-24 22:10:39 +03:00
unknown
52ff597a8a Merge mysql.com:/M41/bug16730-4.1 into mysql.com:/M41/merge-4.1 2006-01-24 17:52:53 +01:00
unknown
6cc16c5019 Test "ctype_ucs": Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).
mysql-test/t/ctype_ucs.test:
  Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).
2006-01-24 13:54:34 +01:00
unknown
e14c9c5d9c Fixed bug #16510: Updating field named like '*name' caused server crash.
When setup_fields() function finds field named '*' it expands it to the list
of all table fields. It does so by checking that the first char of
field_name is '*', but it doesn't checks that the '* is the only char.
Due to this, when updating table with a field named like '*name', such field
is wrongly treated as '*' and expanded. This leads to making list of fields
to update being longer than list of the new values. Later, the fill_record() 
function crashes by dereferencing null when there is left fields to update,
but no more values.

Added check in the setup_fields() function which ensures that the field
expanding will be done only when '*' is the only char in the field name.


mysql-test/t/update.test:
  Added test case for bug#16510: Updating field named like '*name' caused server crash
mysql-test/r/update.result:
  Added test case for bug#16510: Updating field named like '*name' caused server crash
sql/sql_base.cc:
  Fixed bug #16510: Updating field named like '*name' caused server crash.
  Added check in the setup_fields() function which ensures that the field
  expanding will be done only when '*' is the only char in the field name.
2006-01-23 21:51:32 +03:00
unknown
736f9c09d7 Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1
into  phoenix.(none):/data/mysql-4.1-BK
2006-01-23 16:34:53 +01:00
unknown
a120d6c521 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1
2006-01-23 19:34:52 +04:00
unknown
0ee28e1a4d BUG#16489 - utf8 + fulltext leads to corrupt index file.
Fixed that UPDATE statement crashes multi-byte charset fulltext index.


myisam/ft_update.c:
  Fixed that UPDATE statement crashes multi-byte charset fulltext index.
  While updating, always rewrite multi-byte charset fulltext index.
mysql-test/r/fulltext2.result:
  Added a testcase for BUG#16489.
mysql-test/t/fulltext2.test:
  Added a testcase for BUG#16489.
2006-01-23 17:15:33 +04:00
unknown
b0a310470e Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug14634/my41-bug14634
2006-01-23 13:07:27 +01:00
unknown
c56ae50732 Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1
into  phoenix.(none):/data/mysql-4.1-BK
2006-01-23 11:18:06 +01:00
unknown
ffe11393c9 Merge hf@192.168.21.12:work/mysql-4.1.15429
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
2006-01-21 17:55:58 +04:00
unknown
a8e1b46834 Merge hf@192.168.21.12:work/mysql-4.1.14320
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
2006-01-21 17:54:30 +04:00
unknown
32fc680089 Merge hf@192.168.21.12:work/mysql-4.1.9855
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg


sql/item_func.cc:
  Auto merged
2006-01-21 17:53:29 +04:00
unknown
f7eefc0200 reintroduce --no-defaults to ndb_mgmd
mysql-test/ndb/ndbcluster.sh:
  have made a real fix for mgmd not starting with --no-defaults. re-introduce it to the test suite
2006-01-20 00:08:26 +11:00
unknown
52921923ab Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2006-01-19 22:52:22 +11:00
unknown
71f54b97cb small typo fixes
mysql-test/ndb/ndbcluster.sh:
  small fix to make ndb_mgmd run
ndb/tools/ndb_size.pl:
  small typo
2006-01-19 22:50:54 +11:00
unknown
1e8e302eff A fix and a test case for Bug#15613 "libmysqlclient API function
mysql_stmt_prepare returns wrong field length"


sql/protocol.cc:
  A fix for Bug#15613: make sure that result set column length
  is evaluated correctly for BLOB/TEXT columns.
tests/mysql_client_test.c:
  A test case for Bug#15613
2006-01-18 22:50:31 +03:00
unknown
621d88369d Merge bk-internal:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug14634/my41-bug14634


sql/sql_select.cc:
  Auto merged
2006-01-18 14:12:27 +01:00
unknown
029eb59455 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1


sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-01-18 13:49:37 +02:00
unknown
e7c25ed4a1 Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851).
mysql-test/r/kill.result:
  BUG#14851 test
mysql-test/t/kill.test:
  BUG#14851 test
sql/sql_class.cc:
  Debug prints are added.
sql/sql_select.cc:
  Allocation of tmp_join fixed to involve constructor (it is not related to the bug directly but might cause other problems).
  Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851).
sql/sql_select.h:
  JOINs constructor added, initialization of them fixed (it is not related to the bug directly but might cause other problems).
2006-01-18 13:48:57 +02:00
unknown
2ac00d8bb2 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug14634/my41-bug14634


sql/sql_select.cc:
  Auto merged
2006-01-18 12:28:52 +01:00
unknown
984484015c Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11331
2006-01-18 11:37:08 +11:00
unknown
55b78e4407 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into  devsrv-b.mysql.com:/space/magnus/my41-bug14634
2006-01-17 22:35:04 +01:00
unknown
22bc685dbf A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":
use the right type in mysql_stmt_attr_get


libmysql/libmysql.c:
  Fix Bug#16144 "mysql_stmt_attr_get type error"
tests/mysql_client_test.c:
  A test case for Bug#16144
2006-01-17 23:19:43 +03:00
unknown
16d16b9582 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1


configure.in:
  Auto merged
2006-01-18 00:02:25 +04:00
unknown
1c5070587a Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug14634/my41-bug14634
into  devsrv-b.mysql.com:/space/magnus/my41-bug14634


sql/sql_select.cc:
  Auto merged
2006-01-17 19:40:40 +01:00
unknown
2845da017e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/mysql-4.0
2006-01-17 17:37:07 +01:00
unknown
646d79050c Bug #14634 Running out of diskspace on tmpdir returns an inappropriate error
sql/sql_select.cc:
  Backport from 5.0, catch the new errno that is returned
2006-01-17 16:48:26 +01:00
unknown
91b4e6b544 BUG#3074: Unversioned symbols in shared library
libmysqlclient versioning when linked with GNU ld.


BitKeeper/etc/ignore:
  Added libmysql/libmysql.ver to the ignore list
configure.in:
  libmysqlclient versioning when linked with GNU ld.
libmysql/Makefile.shared:
  libmysqlclient versioning when linked with GNU ld.
libmysql/libmysql.ver.in:
  New BitKeeper file ``libmysql/libmysql.ver.in''
2006-01-17 18:51:08 +04:00
unknown
07eca7f962 Increase the version number to 4.1.18 2006-01-17 12:55:30 +01:00
unknown
8806198464 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2006-01-17 09:05:18 +01:00
unknown
5c5864dd8f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/opt/local/work/mysql-4.1-root
2006-01-17 01:13:55 +03:00
unknown
17ccdd1a05 A fix for Bug#13337 "ps test fails if configure wo/ usc2"
mysql-test/r/ctype_ucs.result:
  Test results changed (Bug#13337)
mysql-test/r/ps.result:
  Test results changed (Bug#13337)
mysql-test/t/ctype_ucs.test:
  Fix Bug#13337 (move the test that uses UCS character set to 
  ctype_ucs)
mysql-test/t/ps.test:
  Fix Bug#13337 (move the test that uses UCS character set to 
  ctype_ucs)
2006-01-17 01:03:03 +03:00
unknown
49e2e3c956 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2006-01-16 21:23:29 +02:00
unknown
f41b7bca6c Merge
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  SCCS merged
2006-01-16 16:21:41 +01:00
unknown
e5f077f79a date_formats.test:
fix for bug #15828 after review
  doing val_str now before testing of null value secures the function for null values returned by dynamic functions - the fix before was incomplete andy covered constant null values


mysql-test/t/date_formats.test:
  fix for bug #15828 after review
  doing val_str now before testing of null value secures the function for null values returned by dynamic functions - the fix before was incomplete andy covered constant null values
2006-01-16 15:46:37 +01:00