mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18089 commits 2784 branches 343 tags 1.6 GiB
Commit graph

18089 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@mysql.com
3dcfc31e76 Remove references to result.es files 2005-04-12 18:04:32 -07:00
marko@hundin.mysql.fi
d5646eb6c5 InnoDB: Ignore character set mismatch in ALTER TABLE and RENAME TABLE 
if foreign_key_checks=0. (Bug #9802)
 2005-04-12 16:12:34 +03:00
joreland@mysql.com
b38a5171a6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-04-12 13:56:58 +02:00
joreland@mysql.com
2e1e670b57 bug#9757 - ndb - post review 
use DBUG_RETURN
 2005-04-12 13:56:24 +02:00
joreland@mysql.com
8f0f041e64 bug#9757 - ndb 
Impl. stupid mgm lock against shutting down 2 nodes simultaniously
  Add some more dump
 2005-04-12 13:36:43 +02:00
serg@serg.mylan
98601055b6 backport kill.test fix from 5.0 2005-04-11 22:36:07 +02:00
serg@serg.mylan
be1bbf940b Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-04-11 20:49:19 +02:00
serg@serg.mylan
0294339b9c don't check record's checksum in REPAIR 2005-04-11 20:04:50 +02:00
gbichot@quadita2.mysql.com
f356fb08d6 In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end 
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).
 2005-04-11 17:37:49 +02:00
gbichot@quadita2.mysql.com
e42312c05d Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
 2005-04-11 16:47:39 +02:00
gbichot@quadita2.mysql.com
c7c928f168 Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice in the binary log" 
if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).
 2005-04-11 16:46:03 +02:00
reggie@mdk10.(none)
d07945c23b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-4.1
 2005-04-11 09:19:49 -05:00
dlenev@brandersnatch.localdomain
831a612483 Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER() 
function" into 4.1 tree.
 2005-04-11 10:44:48 +04:00
dlenev@mysql.com
b0dd388190 Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796 
into mysql.com:/home/dlenev/src/mysql-4.1-merges
 2005-04-11 09:53:54 +04:00
dlenev@mysql.com
06e3647274 Fix for bug #9796 "Query Cache caches queries with CURRENT_USER() 
function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.
 2005-04-11 00:30:23 +04:00
bar@mysql.com
16e186779f ctype_collate.result, ctype_collate.test, union.result, union.test: 
fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.
 2005-04-10 12:40:33 +05:00
acurtis@xiphis.org
aae638bbb2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.1
 2005-04-09 07:37:00 +01:00
acurtis@xiphis.org
0998ec4264 Fix typos in Bug#6776 2005-04-09 00:21:51 +01:00
acurtis@xiphis.org
e82edda6c6 Merge xiphis.org:/var/db/bk/work-acurtis/bug6776 
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1
 2005-04-08 21:40:50 +01:00
reggie@mdk10.(none)
9506fb97b5 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-4.1
 2005-04-08 14:17:29 -05:00
marko@hundin.mysql.fi
a0af6bb7f5 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/mysql-4.1
 2005-04-08 22:17:28 +03:00
reggie@mdk10.(none)
3f5b8b976c Bug #9665 After registering MySQL service and starting with shared mem, cannot stop 
Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server
 2005-04-08 09:17:19 -05:00
reggie@mdk10.(none)
56bb135123 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-4.1
 2005-04-08 09:17:18 -05:00
joerg@mysql.com
ea39dffb9f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-04-08 16:17:17 +02:00
joerg@mysql.com
55ee7b9253 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/clone-4.1.11 2005-04-08 16:04:37 +02:00
joreland@mysql.com
d8a5305d0d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-04-08 14:16:57 +02:00
joreland@mysql.com
72d89cc253 bug#9749 - ndb 
test case for case 9749, ndb lock upgrade via NDBAPI
 2005-04-08 14:15:37 +02:00
ingo@mysql.com
3add511de7 Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145) 
Since 4.1 keys are compared with trailing spaces. 
Thus, a "x " key can be inserted between a couple of "x" keys.
The existing code did not take this into account. Though the
comments in the code claimed it did.
 2005-04-08 14:13:02 +02:00
joerg@mysql.com
6bd1bea723 Add missing parts for the "Cybozu" custom build, to avoid future manual patches. 2005-04-08 13:56:48 +02:00
mskold@mysql.com
817f2c6a13 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-08 11:39:22 +02:00
mskold@mysql.com
813cc0eaf0 Added more tests for auto_increment 2005-04-08 11:38:40 +02:00
reggie@mdk10.(none)
c55a7b651f Bug #9665 After registering MySQL service and starting with shared mem, cannot stop 
The shared memory connect event was not being set in kill_server.
This caused the thread that is handling shared memory connections to never
exit.
 2005-04-08 00:16:02 -05:00
msvensson@neptunus.(none)
960410274c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-07 20:21:17 +02:00
mskold@mysql.com
b716302860 Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage, post review fix 2005-04-07 20:08:01 +02:00
mskold@mysql.com
b135b175fa Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-07 17:51:53 +02:00
mskold@mysql.com
89b140340c Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-07 17:44:09 +02:00
sergefp@mysql.com
3f6cdec788 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug8877
 2005-04-07 17:47:37 +04:00
sergefp@mysql.com
0cd5877b02 Post-review fixes: local variable renamed 2005-04-07 17:44:48 +04:00
mskold@mysql.com
934f458140 Added missing DBUG_RETURNs 2005-04-07 12:12:03 +02:00
marko@hundin.mysql.fi
b5328a7dbc InnoDB: Prevent ALTER TABLE ... ENGINE=... 
if there are foreign key constraints on the table. (Bug #5574)
 2005-04-07 12:16:41 +03:00
jimw@mysql.com
699c35c80e Merge mysql.com:/home/jimw/my/mysql-4.0-clean 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-04-06 11:02:20 -07:00
jimw@mysql.com
9dfc87e270 Merge mysql.com:/home/jimw/my/mysql-4.0-9492 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-04-06 10:53:09 -07:00
marko@hundin.mysql.fi
f32fe9c154 InnoDB: Avoid test suite failures caused by a locking conflict 
between two server instances at server shutdown/startup.
This conflict on advisory locks appears to be the result of a bug
in the operating system; these locks should be released when the
files are closed, but somehow that does not always happen
immediately in Linux.  (Bug #9381)
 2005-04-06 15:09:15 +03:00
kent@mysql.com
34284d9354 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-04-06 13:45:14 +02:00
kent@mysql.com
57d8914287 Makefile.am: 
Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test-run.pl:
  Embedded result files no longer needed
 2005-04-06 12:20:55 +02:00
gluh@mysql.com
85bf400612 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
 2005-04-06 15:19:02 +05:00
bar@mysql.com
1c46a02069 Minor clean-ups for the previous commit. 2005-04-06 15:12:44 +05:00
gluh@mysql.com
decfc86fbb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
 2005-04-06 14:14:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables 2005-04-06 14:13:06 +05:00
msvensson@neptunus.(none)
9586a06f85 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-06 10:56:51 +02:00