sergefp@mysql.com
cfce3d823b
Merge
2006-01-26 00:06:20 +03:00
evgen@moonbone.local
6e984d6ede
sql_base.cc:
...
Small fix after merge of fix for bug#16510
2006-01-25 23:28:39 +03:00
sergefp@mysql.com
5d0e8d81ee
BUG#15935: In mysql_update, don't use full index scan when we could have used quick select scan.
2006-01-25 23:25:23 +03:00
evgen@moonbone.local
baed6da5bc
Manually merged
2006-01-24 22:10:39 +03:00
joerg@mysql.com
8d0378f542
Merge mysql.com:/M41/bug16730-4.1 into mysql.com:/M41/merge-4.1
2006-01-24 17:52:53 +01:00
joerg@mysql.com
1fa62bdafc
Test "ctype_ucs": Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).
2006-01-24 13:54:34 +01:00
evgen@moonbone.local
b1967ad723
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.
2006-01-23 21:51:32 +03:00
gvb@phoenix.(none)
5b9d686e87
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
svoj@april.(none)
5616912822
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
svoj@april.(none)
4dc4502ab3
BUG#16489 - utf8 + fulltext leads to corrupt index file.
...
Fixed that UPDATE statement crashes multi-byte charset fulltext index.
2006-01-23 17:15:33 +04:00
msvensson@neptunus.(none)
fd6bf8c5a2
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
gvb@phoenix.(none)
66cb90410c
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
hf@eagle.intranet.mysql.r18.ru
02ce3d0cad
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
hf@eagle.intranet.mysql.r18.ru
717dc2e940
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
hf@eagle.intranet.mysql.r18.ru
b91380456f
Merge hf@192.168.21.12:work/mysql-4.1.9855
...
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
2006-01-21 17:53:29 +04:00
stewart@mysql.com
c079e80122
reintroduce --no-defaults to ndb_mgmd
2006-01-20 00:08:26 +11:00
stewart@mysql.com
ee0c226f8d
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
stewart@mysql.com
95e29a975a
small typo fixes
2006-01-19 22:50:54 +11:00
konstantin@mysql.com
4ca48591f1
A fix and a test case for Bug#15613 "libmysqlclient API function
...
mysql_stmt_prepare returns wrong field length"
2006-01-18 22:50:31 +03:00
msvensson@neptunus.(none)
f23cceca6a
Merge bk-internal:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug14634/my41-bug14634
2006-01-18 14:12:27 +01:00
msvensson@neptunus.(none)
05908883a5
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug14634/my41-bug14634
2006-01-18 12:28:52 +01:00
stewart@mysql.com
75bc48a8d7
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
msvensson@devsrv-b.mysql.com
e83b5aaf01
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
konstantin@mysql.com
19fd36e254
A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":
...
use the right type in mysql_stmt_attr_get
2006-01-17 23:19:43 +03:00
svoj@april.(none)
70bb06685b
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1
2006-01-18 00:02:25 +04:00
msvensson@devsrv-b.mysql.com
df2fefd1e9
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug14634/my41-bug14634
...
into devsrv-b.mysql.com:/space/magnus/my41-bug14634
2006-01-17 19:40:40 +01:00
joerg@mysql.com
0caa010440
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
msvensson@neptunus.(none)
c4ddf67710
Bug #14634 Running out of diskspace on tmpdir returns an inappropriate error
2006-01-17 16:48:26 +01:00
svoj@april.(none)
f84b301bd1
BUG#3074: Unversioned symbols in shared library
...
libmysqlclient versioning when linked with GNU ld.
2006-01-17 18:51:08 +04:00
joerg@mysql.com
e2b3b1f398
Increase the version number to 4.1.18
2006-01-17 12:55:30 +01:00
joerg@mysql.com
38e5a8f6d8
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
konstantin@mysql.com
59b1c9c87a
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
konstantin@mysql.com
739ba76d64
A fix for Bug#13337 "ps test fails if configure wo/ usc2"
2006-01-17 01:03:03 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2659e797ed
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
andrey@lmy004.
7b2238d484
Merge
2006-01-16 16:21:41 +01:00
gvb@phoenix.(none)
8c69d6abaf
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
msvensson@neptunus.(none)
8238f355dc
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554
2006-01-16 13:10:14 +01:00
msvensson@neptunus.(none)
81cef460b1
Merge bk-internal:/home/bk/mysql-4.0
...
into neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554
2006-01-16 12:48:16 +01:00
msvensson@neptunus.(none)
e795f369c4
Merge neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554
...
into neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554
2006-01-16 12:46:07 +01:00
msvensson@neptunus.(none)
b54920bce7
BUG#6554 Problem Building MySql on Fedora Core 3
...
- Remove the local static var
2006-01-16 12:17:30 +01:00
aivanov@mysql.com
c46f11fa96
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss14
2006-01-15 14:56:38 +03:00
aivanov@mysql.com
ee2b765751
Changes from innodb-4.1-ss14 snapshot
...
Fixed BUG#14056: Column prefix index on UTF-8 primary key
causes "Can't find record.."
Also fixed bug 15991.
2006-01-15 14:50:47 +03:00
gvb@phoenix.(none)
8885c80da2
item_timefunc.cc:
...
fix for bug #15828 after review
2006-01-14 16:06:51 +01:00
gvb@phoenix.(none)
421eededd3
item_timefunc.cc:
...
fix for bug#15828 after review
2006-01-14 09:53:12 +01:00
konstantin@mysql.com
48d48bc936
A fix and a test case for Bug#12734 " prepared statement may
...
return incorrect result set for a select SQL request"
2006-01-14 04:55:07 +03:00
joerg@mysql.com
1155bf20d9
Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1
2006-01-13 17:45:01 +01:00
joerg@mysql.com
bccbc740c3
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/merge-4.1
2006-01-13 17:26:16 +01:00
joerg@mysql.com
9d4562e5fe
extra/comp_err.c + scripts/mysqld_multi.sh :
...
Copyright string fixes (bug#16106)
2006-01-13 16:25:20 +01:00
gvb@phoenix.(none)
45db1c24b0
fix for bug#15828
...
problem was not checking 2nd parameter of str_to_date against NULL
2006-01-13 14:42:46 +01:00
bar@mysql.com
977731b3fc
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15377
2006-01-13 16:21:44 +04:00