1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-21 11:01:08 +03:00
Commit Graph

9076 Commits

Author SHA1 Message Date
igor@rurik.mysql.com
817bf33d48 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-02-17 01:51:56 -08:00
igor@rurik.mysql.com
326b3ec1e7 select.test:
Manual post-merge
2005-02-17 00:51:27 -08:00
igor@rurik.mysql.com
b6be797f81 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-02-17 00:38:33 -08:00
tomas@poseidon.ndb.mysql.com
6e51577b52 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-17 09:37:07 +01:00
igor@rurik.mysql.com
5a3806e5df Manual merge 2005-02-17 00:34:06 -08:00
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
patg@krsna.patg.net
986e122303 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.patg.net:/home/patg/mysql-5.0
2005-02-16 22:36:43 -08:00
tomas@poseidon.ndb.mysql.com
7b2f7b43c5 Merge 2005-02-17 07:05:00 +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
a2c728b2ca Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 05:25:46 +01: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
sergefp@mysql.com
3724e8e0b4 A "fix" for problem discovered in BUG#8510: remove ONLY_FULL_GROUP_BY mode from ANSI mode, as currently
ONLY_FULL_GROUP_BY mode is overly restrictive.
2005-02-17 07:12:31 +03:00
kent@mysql.com
706a0dbc37 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 03:35:55 +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
kent@mysql.com
ba927fdb4c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-17 03:04:28 +01: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
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
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
guilhem@mysql.com
18ecaae189 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-02-16 23:27:20 +01:00
guilhem@mysql.com
f314564451 Fixes after 4.1->5.0 merge. 2005-02-16 23:23:20 +01:00
mskold@mysql.com
96188c81e9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-16 23:16:02 +01:00
mskold@mysql.com
63a19c4791 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-16 21:29:19 +01:00
pekka@mysql.com
338f75a49d ndb - fix new decimal type mysql vs. ndb 2005-02-16 21:19:42 +01:00
guilhem@mysql.com
0987d81ae6 Merge 2005-02-16 21:03:58 +01:00
tomas@poseidon.ndb.mysql.com
334d92db03 reuse nodeid if ndbd is restarted 2005-02-16 20:46:34 +01:00
tomas@poseidon.ndb.mysql.com
6e53d8f75d Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-16 18:41:58 +01:00
serg@serg.mylan
5ddb6354a5 after merge fixes 2005-02-16 17:34:02 +01:00
tomas@poseidon.ndb.mysql.com
27538f49e3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-16 17:27:58 +01:00
pekka@mysql.com
c32fc95769 ndb - temp: comment out decimal tests t/ndb* 2005-02-16 17:10:17 +01:00
pem@mysql.com
25a9717a03 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-02-16 16:12:52 +01:00
pem@mysql.comhem.se
de2b28c1ad Fixed BUG#8540: Local variable overrides an alias. 2005-02-16 16:06:41 +01:00
pekka@mysql.com
c177f9fc4a Merge 2005-02-16 13:14:21 +01:00
mskold@mysql.com
5d23cdb591 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-16 13:13:13 +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
mskold@mysql.com
37301115c3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-16 11:17:14 +01:00
dean@mysql.com
e7f410a14a Merge 2005-02-16 04:04:34 -06:00
msvensson@neptunus.homeip.net
e4ad041abf Fix ndb_autodiscover 2005-02-16 11:02:48 +01:00
gluh@gluh.mysql.r18.ru
638dc7d9e9 Fix for bug#7915: crash,JOIN VIEW, subquery, SELECT .. FROM INFORMATION_SCHEMA.COLUMNS 2005-02-16 13:00:03 +03: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
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