Commit graph

17620 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
ec33ff6792 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-17 07:36:54 +01:00
igor@rurik.mysql.com
4fd1869c6b Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-16 21:20:39 -08:00
igor@rurik.mysql.com
eedde7ba3e select.result, select.test:
Added a test case for bug #7098.
sql_select.cc:
  Fixed bug #7098.
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.
2005-02-16 21:17:20 -08:00
kent@mysql.com
682a27c1f0 init_db.sql:
Make SQL more readable, substitute hostname at runtime
mysql-test-run.pl:
  Run init scripts with /bin/sh, ignore return code
2005-02-17 05:22:14 +01:00
kent@mysql.com
c9f6fbff1d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-17 03:34:30 +01:00
jimw@mysql.com
51d6411e11 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-16 18:10:30 -08:00
kent@mysql.com
75ebab7861 Windows compatibility changes of the 'rpl_delete_all',
'ps_1general' and 'fulltext_cache' test cases.
2005-02-17 02:59:39 +01:00
jimw@mysql.com
64ef4ec2f3 Fix output of perror to include whether the error message
corresponds to an OS or MySQL error. (Bug #8517)
2005-02-16 17:37:56 -08:00
dean@mysql.com
2baf0a158c Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dellis/bkl/bug-4.1
2005-02-16 19:37:53 -06:00
acurtis@pcgem.rdg.cyberkinetica.com
a1bf1c926e Bug#8147
Fix ambigious table error for INSERT..SELECT..UPDATE
2005-02-17 01:33:59 +00:00
dean@mysql.com
b64fdf882a Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
2005-02-16 19:15:08 -06:00
kent@mysql.com
75b0b945ca Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-17 02:11:03 +01:00
lars@mysql.com
8663d77775 BUG#8297: If query is filtered on slave, do not put it in general log. 2005-02-17 00:28:04 +01: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
jimw@mysql.com
aa70a6ce06 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-16 14:01:21 -08:00
tomas@poseidon.ndb.mysql.com
33c297cfb0 bug #8556 corrupt ndb_mgm show printout for certain configurations 2005-02-16 21:54:35 +01:00
jimw@mysql.com
9df24e5ebd When calling initgroups(), set a flag that the segfault handler checks
in order to output a special warning about a particular case of segfaults
due to a mix of static binaries, NSS, and LDAP. (Bug #4872)
2005-02-16 11:58:35 -08:00
tomas@poseidon.ndb.mysql.com
788f6b5af5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-16 20:54:47 +01:00
tomas@poseidon.ndb.mysql.com
334d92db03 reuse nodeid if ndbd is restarted 2005-02-16 20:46:34 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
3261bf189a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1
2005-02-16 16:33:57 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b119963f13 Merge 2005-02-16 16:29:56 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
c385f169f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445
2005-02-16 16:07:53 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
aecc58b3d8 Bug#4445
Make a more informative platform info for Windows
2005-02-16 16:05:18 +00:00
lenz@mysql.com
9efeb56690 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-02-16 14:06:11 +01:00
pekka@mysql.com
0d03304294 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2
2005-02-16 12:48:38 +01:00
pekka@mysql.com
7c9a155c4a ndb - fix old decimal type mysql vs ndb 2005-02-16 12:45:59 +01:00
kent@mysql.com
b32f693ee4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-16 12:10:13 +01:00
joreland@mysql.com
96c76529c5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-16 11:48:18 +01:00
dean@mysql.com
e7f410a14a Merge 2005-02-16 04:04:34 -06:00
dean@mysql.com
87718094aa fulltext.test, fulltext.result:
Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().
2005-02-16 03:13:29 -06:00
guilhem@mysql.com
8e93873d5b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-16 10:02:54 +01:00
guilhem@mysql.com
bbcc1464d5 rpl_multi_query.test: disable ps-protocol as PS don't support multi-queries 2005-02-16 10:01:05 +01:00
lenz@mysql.com
207e87eb87 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-02-16 08:34:23 +01:00
igor@rurik.mysql.com
3100f891d2 Manual merge 2005-02-15 21:03:17 -08:00
igor@rurik.mysql.com
d9f66a261b Merge rurik.mysql.com:/home/igor/mysql-4.0
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2005-02-15 18:48:04 -08:00
igor@rurik.mysql.com
d4779d3534 delete.result, delete.test:
Added a test case for bug #8392.
sql_delete.cc:
  Fixed bug #8392.
  The bug caused a crash for a delete statement with ORDER BY
  that explicitly referred to the modified table.
2005-02-15 18:45:42 -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
jimw@mysql.com
a6afab6a55 Always lowercase database names from 'host' and 'db' grant tables when they
are loaded and lower_case_table_names is set, but issue a warning when it is
done. (Bug #7989)
2005-02-15 13:36:46 -08:00
jimw@mysql.com
dee9795b5b Merge 2005-02-15 12:19:01 -08:00
joerg@mysql.com
109560c5bf Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-02-15 21:03:59 +01:00
jimw@mysql.com
e2291bdc7e Only escape the first character in a sequence of bytes that appears to be
a multibyte character, but was not a valid multibyte character. Refinement
of fix for Bug #8378.
2005-02-15 11:31:01 -08:00
kent@mysql.com
50fe0ccbea Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-15 16:13:03 +01:00
marko@hundin.mysql.fi
df0aee432a Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-02-15 16:12:51 +02:00
guilhem@mysql.com
4f41de1cc5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-15 15:12:50 +01:00
joerg@mysql.com
d7f64e01c8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-02-15 15:07:56 +01:00
joerg@mysql.com
e6b815a92e 1) Tag the 4.1.10 released version: bk tag -r 1.2159.8.1 "mysql-4.1.10"
2) Raise the version number to 4.1.11.
2005-02-15 14:13:18 +01:00
guilhem@mysql.com
a8380942bf Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-15 14:12:26 +01:00
monty@mysql.com
44ceb84cdc Merge with 4.0 2005-02-15 14:49:52 +02:00
marko@hundin.mysql.fi
c4ff270284 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-02-15 14:42:14 +02:00