mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19897 commits 2791 branches 343 tags 1.7 GiB
Commit graph

5668 commits

Author SHA1 Message Date
acurtis@pcgem.rdg.cyberkinetica.com
647eaaea1d Bug#8147 
Merge from 4.1
 2005-02-17 17:38:13 +00: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
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
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
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
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
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
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
dlenev@brandersnatch.localdomain
0a96ef4c90 Temporary disabling part of test which fails in --ps-protocol mode. 2005-02-15 22:17:44 +03:00
monty@mysql.com
71e4859389 After merge fixes 2005-02-15 19:25:42 +02:00
monty@mysql.com
38d1a42481 Merge with 4.1 2005-02-15 17:12:13 +02:00
monty@mysql.com
410e51c854 Fixed failing test cases 'row.test' when running with --ps-protocol 
Simple optimzations done while reviewing code
 2005-02-15 16:45:00 +02: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
788a2658a3 Better bug fix for #5569: "Incorrect "Access Denied" error with SAME login DIFFERENT host" 
This fixes also the reverse lookup bug introduced by the previous patch
 2005-02-15 14:42:13 +02:00
guilhem@mysql.com
55fb16a7a6 1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores" 
and fixing it another way (per Monty; a simpler solution which does not increase the number
of binlog events is to always execute DROP TEMPORARY TABLE IF EXISTS on slave). A new test rpl_drop_temp.
2) fixing BUG#8436 "Multiple "stacked" SQL statements cause replication to stop" by setting
thd->query_length to the length of the query being executed, not counting the next queries
if this is a multi-query. Should also improve display of SHOW PROCESSLIST. A new test rpl_multi_query.
 2005-02-14 23:47:17 +01:00
sergefp@mysql.com
c30f7feba1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug8218
 2005-02-14 23:49:01 +03:00
sergefp@mysql.com
919f2f2364 Merge mysql.com:/home/psergey/mysql-4.1-bug8218 
into mysql.com:/home/psergey/mysql-5.0-bug8218
 2005-02-14 23:47:31 +03:00
sergefp@mysql.com
021f9849ef Remove redundant DROP TABLE from test case 2005-02-14 23:45:48 +03:00
matthias@three.local.lan
d6c5089e92 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
 2005-02-14 16:34:36 +01:00
gluh@gluh.mysql.r18.ru
29510ce029 Fix for bug#8156:information_schema and lowercase_table3 fail on OSX 
Can't repeat information_schema test failure
Fix for lowercase_table3 only
 2005-02-14 18:23:10 +03: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
mleich@mysql.com
cb56fcaa94 Removal of a not needed statement 2005-02-14 14:20:43 +01:00
matthias@three.local.lan
e8bf23c16a Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
 2005-02-14 10:23:53 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
4957c4850d Bug#2435 
Alter handling for UNION syntax
  Tests for UNION and parentheses
 2005-02-13 22:35:52 +00:00
kent@mysql.com
ba3f9acff6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-02-13 18:22:38 +01:00
sergefp@mysql.com
c0c50efdef Fix for BUG#8218: 
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
pointing to the wrong List.
 2005-02-12 22:58:54 +03:00
bar@mysql.com
9ba7392306 Bug#8235 Connection collation change & table create with default result in crash 2005-02-12 16:27:22 +04:00
serg@serg.mylan
40da910d4c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-02-12 09:38:15 +01:00
serg@serg.mylan
42bb0901a3 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-02-12 00:10:07 +01:00
serg@serg.mylan
d355174522 make LOAD INDEX to work 2005-02-12 00:05:13 +01:00
igor@rurik.mysql.com
cdb40830d2 Manual merge 2005-02-11 15:00:29 -08:00
igor@rurik.mysql.com
1bb04b0642 distinct.result: 
Adjustment of the result file after the revision of the fix for bug #7520.
 2005-02-11 13:44:54 -08:00
igor@rurik.mysql.com
634424ca16 select.result: 
After revision of the fix for bug #7520.
table.cc:
  Revised the fix for bug #7520.
  Made it compliant with 5.0 code where the bug does not exist.
 2005-02-11 10:39:26 -08:00
matthias@three.local.lan
9c7d94d408 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
 2005-02-11 17:57:35 +01:00
ingo@mysql.com
601a4fdfa2 Merge 2005-02-11 11:59:35 +01:00
igor@rurik.mysql.com
a697e5da15 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-02-10 23:48:35 -08:00
igor@rurik.mysql.com
4ef431ad55 select.result: 
Adjusted results of the test case for bug #7520 for 4.1.
 2005-02-10 23:47:57 -08:00
igor@rurik.mysql.com
06ff30f6c0 Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-02-10 22:17:18 -08:00
igor@rurik.mysql.com
8b3d59ad42 select.result, select.test: 
Added a test case for bug #7520.
table.cc:
  Fixed bug #7520.
  The bug was caused by a wrong calculation of the field max_key_length for
  a TABLE structure when there was an index on a blob field.
 2005-02-10 22:15:38 -08:00