bell@52.0.168.192.in-addr.arpa
9d23922eb6
Post review changes
2005-02-23 18:51:10 +02:00
monty@mysql.com
e2ea35ec67
Merge with 4.1
2005-02-22 15:47:00 +02:00
bell@51.0.168.192.in-addr.arpa
9a9811f3a4
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 13:00:00 +02:00
bell@51.0.168.192.in-addr.arpa
a11369b999
Merge
2005-02-20 18:49:27 +02:00
msvensson@neptunus.(none)
3d0883bb05
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-8583
2005-02-18 11:02:21 +01:00
jimw@mysql.com
7eb8c130f7
Merge
2005-02-17 16:16:58 -08:00
jimw@mysql.com
7e499384b4
Merge mysql.com:/home/jimw/my/mysql-4.0-clean
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:46:33 -08:00
jimw@mysql.com
4decbce5ea
Merge mysql.com:/home/jimw/my/mysql-4.0-no-merge-spam
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-17 13:45:20 -08:00
msvensson@neptunus.(none)
55824f59b7
Merged test case
2005-02-17 14:45:52 +01:00
dean@mysql.com
2f7595ea84
Merge mysql.com:/home/dellis/bkl/bug-4.1
...
into mysql.com:/home/dellis/bkl/bug-5.0
2005-02-16 17:35:00 -06:00
jimw@mysql.com
af41813cff
Make post-commit trigger not send emails when the message would not contain
...
any actual changes. (Often the case in merges where the only change involves
renumbering ChangeSet entries.)
2005-02-16 14:03:16 -08:00
dean@mysql.com
ace1d892f0
Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
...
into mysql.com:/home/dellis/bkl/bug-4.1
2005-02-15 17:30:40 -06:00
dean@mysql.com
c962d060ac
ft_nlq_search.c:
...
Added bounds check to avoid accessing unallocated FT_DOC array. (BUG #8522 )
2005-02-15 17:27:23 -06:00
monty@mysql.com
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
svoj@mysql.com
643b602832
Bug#8351
...
Fix for crash when using a double quote in boolean fulltext query.
2005-02-14 18:54:12 +04:00
igor@rurik.mysql.com
6e06100b0c
Manual merge
2005-02-11 18:14:44 -08:00
igor@rurik.mysql.com
e528a1c777
Manual merge
2005-02-11 10:44:03 -08:00
ingo@mysql.com
601a4fdfa2
Merge
2005-02-11 11:59:35 +01:00
jimw@mysql.com
6daef0229c
Fix extra blank line in emails sent by post-commit trigger.
2005-02-10 20:31:23 -08:00
jimw@mysql.com
3d265e9777
Merge commit trigger
2005-02-10 14:32:01 -08:00
jimw@mysql.com
b3d2e434ee
Merge bk-internal:/home/bk/mysql-4.0
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-10 14:23:05 -08:00
serg@serg.mylan
3e708a27b1
Merge
2005-02-09 15:16:47 +01:00
serg@serg.mylan
184410c475
gone:
...
merged
auto-union
2005-02-09 15:16:14 +01:00
mskold@bk-internal.mysql.com
14e3d36ad4
Removed old files
2005-02-09 14:35:50 +01:00
serg@serg.mylan
78cf24fb8c
clean up gone
2005-02-09 14:05:01 +01:00
msvensson@neptunus.homeip.net
c9d7cd043b
Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
...
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
2005-02-04 15:13:45 +01:00
ramil@mysql.com
0d7228fff2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1
2005-02-04 15:53:14 +04:00
ramil@mysql.com
f76ccd63cb
type_float.result.es updated.
2005-02-04 15:35:08 +04:00
ramil@mysql.com
611e0e3e82
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/usr/home/ram/work/4.0
2005-02-04 13:59:13 +04:00
ramil@mysql.com
e8ed450e15
type_float.result.es updated
2005-02-04 13:51:37 +04:00
mikael@orca.ndb.mysql.com
3b535f6072
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into orca.ndb.mysql.com:/export/home/mikael/mysql-5.0
2005-02-03 21:16:05 +01:00
mikael@orca.ndb.mysql.com
0bb030a145
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into orca.ndb.mysql.com:/export/home/mikael/mysql-4.1
2005-02-03 21:13:28 +01:00
msvensson@neptunus.homeip.net
3181f5d2b6
Merged "query cache for ndb" to 5.0
2005-02-03 09:33:48 +01:00
brian@zim.(none)
630e020d3e
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-01-31 11:03:57 -08:00
tulin@mysql.com
bc317a19ce
BUG#8208 don't fsync unless something has been written
...
+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1
2005-01-31 11:47:10 +01:00
brian@zim.(none)
b484e29231
Cleanup for lost file descriptors on close table for ha_archive.
2005-01-28 16:43:10 -08:00
tulin@mysql.com
0c81869537
ndb_opt_defaults.h:
...
removed usage of SIGRTMIN temorarilly as it causes problems on some platforms
2005-01-28 19:28:14 +01:00
jimw@mysql.com
c12c5b4e4c
Add BUG# to subject and X-Bug header for all outgoing
...
emails re: bug fixes, and update the URL for the manual
page on installing from the source tree.
Fake bug number for testing: Bug #1234
2005-01-25 12:24:50 -08:00
patg@patrick-galbraiths-computer.local
d6727ff70f
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-24 11:31:21 -08:00
patg@pc248.lfp.kcls.org
1da60b9f45
-Added quote_data and needs_quotes (moved from federated handler.
...
-New tests and results
logging_ok:
Logging to logging@openlogging.org accepted
ha_federated.h:
removed quote_data and type_quote (now in the Field class)
ha_federated.cc:
moved quote_data and type_quote to field class
field.h:
new methods quote_data and needs_quotes declared
field.cc:
new field class methods quote_data and needs_quotes (per Monty's request)
federated.test:
more tests, joins, index tests
have_federated_db.require:
new name of federated system var
federated.result:
new test results for federated handler
have_federated_db.inc:
changed name of variable in test due to change in vars
sql_analyse.cc:
over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler.
mysql_priv.h:
define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler
ha_federated.cc:
implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions.
2005-01-20 18:36:40 -08:00
tulin@build.mysql.com
3e4a4a2aea
Merge build.mysql.com:/users/tulin/mysql-5.0
...
into build.mysql.com:/users/tulin/mysql-5.1
2005-01-19 03:37:51 +01:00
monty@mysql.com
502ba93b38
Merge with global tree
2005-01-18 04:03:26 +02:00
reggie@bob.(none)
da9f7c7ec4
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bob.(none):/home/reggie/bk/mysql-4.1
2005-01-17 14:08:36 -06:00
kaa@polly.local
c46f527454
Fixed memory leak in handle_local_infile()
2005-01-17 19:21:01 +03:00
reggie@bob.(none)
68c540f090
Bug #7922 prompt \p fails on Windows for shared-memory connections
...
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
2005-01-15 23:19:34 -06:00
msvensson@neptunus.homeip.net
cb7524e103
Merge problem
...
FC3 fix
2005-01-14 14:33:26 +01:00
tulin@build.mysql.com
938135af57
Merge build.mysql.com:/users/tulin/mysql-5.0
...
into build.mysql.com:/users/tulin/mysql-5.1
2005-01-13 10:13:06 +01:00
vtkachenko@mail.mysql.com
306df48731
Merge
2005-01-12 21:03:06 +01:00
vtkachenko@mail.mysql.com
9f640bbad9
logging_ok:
...
Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
2005-01-12 20:55:06 +01:00
lenz@mysql.com
442a3a98b0
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-5.0-build
2005-01-10 16:32:03 +01:00