database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Code Activity
46,939 Commits 3,273 Branches 1,096 Tags
016bff8adcc2332772b51f8dbdc5a3d926f5a04c
Commit Graph

18065 Commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
29eaad6288 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-10 13:47:20 +02:00
jonas@perch.ndb.mysql.com
69de7d8759 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-10 13:34:34 +02:00
jonas@perch.ndb.mysql.com
732f9f6843 ndb - bug#21283 
this test in its current form depend on binlog format row
 2006-08-10 13:33:49 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
50ae5b7989 Fix for bug #20709: Collation not used in group by on 4.1. 
myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
TEXT and VARTTEXT key segments.
 2006-08-10 15:06:22 +05:00
andrey@example.com
eba9109225 after merge update 2006-08-10 11:52:34 +02:00
holyfoot/hf@mysql.com/deer.(none)
1ada6ca108 bug #20910 (NOT NULL column reported as NULL in SHOW FIELDS) 
two test results changed after the patch
 2006-08-10 14:50:54 +05:00
brian@zim.(none)
65e9ae97b0 This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 2006-08-10 01:50:37 -07:00
cmiller@zippy.cornsilk.net
543fcde9b9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
 2006-08-09 22:23:41 -04:00
cmiller@zippy.cornsilk.net
8e4460343f Removed iggy's accidentally checked-in test files. 2006-08-09 13:41:08 -04:00
rburnett@bk-internal.mysql.com
437813fb8c Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-09 17:58:28 +02:00
andrey@lmy004.
9a325ac786 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  lmy004.:/work/mysql-5.1-runtime
 2006-08-09 17:19:39 +02:00
andrey@lmy004.
76ff7fb78f Fix for bug#20701 BINARY keyword should be forbidden in stored routines 
create function func() returns char(10) binary ...
is no more possible. This will be reenabled when 
bug 2676 "DECLARE can't have COLLATE clause in stored procedure"
is fixed.

Fix after 2nd review
 2006-08-09 17:07:59 +02:00
mskold/marty@mysql.com/linux.site
794c874853 bug #18184 SELECT ... FOR UPDATE does not work..: Updated result file 2006-08-09 16:12:24 +02:00
mskold/marty@linux.site
c3da14f4c5 Merge mysql.com:/home/marty/MySQL/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.1-ndb
 2006-08-09 15:02:30 +02:00
kroki/tomash@moonlight.intranet
e79876362e Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-rt-merge
 2006-08-09 16:42:21 +04:00
mskold/marty@mysql.com/linux.site
b36bcc316a Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: added more tests 2006-08-09 14:32:56 +02:00
holyfoot/hf@mysql.com/deer.(none)
ba90c1e9fa Merge bk@192.168.21.1:mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.20910
 2006-08-09 14:57:51 +05:00
kroki/tomash@moonlight.intranet
5c272816ca Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-09 13:37:20 +04:00
patg@govinda.patg.net
21f7f34776 BUG #21524 "'ps' test fails in --ps-protocol test AMD64 bit" 
(this is not a fix to the bug, but simply to disable the test in 
order to push a 5.0 to 5.1 merge)

This merge contains:

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
 2006-08-08 14:32:39 -07:00
patg@govinda.patg.net
8d1e5a5bb1 Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
 2006-08-08 09:01:32 -07:00
mikael/pappa@dator5.(none)
77090920f8 BUG#21173: SHOW TABLE STATUS crashes mysqld 
Review fixes
 2006-08-08 09:58:55 -04:00
mikael/pappa@dator5.(none)
79ab9cef27 BUG#21143: mysqld hangs when using wrong number of subpartitions 
Rewrote if-statement a bit shorter
Added check for subpartitions in REORGANIZE partitions to be of same number as
in base table.
 2006-08-08 08:52:51 -04:00
mikael/pappa@dator5.(none)
47a8ebe733 BUG#21173: SHOW TABLE STATUS crashes on InnoDB tables 
Don't use get_auto_increment on tables without auto_increment fields
 2006-08-08 08:47:58 -04:00
mskold/marty@mysql.com/linux.site
9241fba4ae Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-08-08 14:42:05 +02:00
gluh@mysql.com/gluh.(none)
7e07425b2b Bug#16172 DECIMAL data type processed incorrectly 
issue an 'overflow warning' if result value is bigger than max possible value
 2006-08-08 16:03:42 +05:00
mskold/marty@mysql.com/linux.site
a922e328af bug #18184 SELECT ... FOR UPDATE does not work..: Added lockTuple call in close_scan 2006-08-08 12:22:23 +02:00
gluh@mysql.com/gluh.(none)
1be93531ee Bug#16172 DECIMAL data type processed incorrectly 
issue an error in case of DECIMAL(M,N) if N > M
 2006-08-08 14:40:07 +05:00
holyfoot/hf@mysql.com/deer.(none)
de7e53d531 bug #20910 (NOT NULL reported as NULL for TIMESTAMP) 
we intentionally reported that for TIMESTAMPS, which isn't right
 2006-08-08 13:34:27 +05:00
gluh@mysql.com/gluh.(none)
e9b87a1a7f result fix 2006-08-08 12:50:05 +05:00
mikael/pappa@dator5.(none)
e80f98b804 Made sure that strange numbers are not allowed syntax-wise. 2006-08-07 12:02:28 -04:00
svoj@may.pils.ru
b5cd11cf0e After merge fix. 2006-08-07 19:35:02 +05:00
mikael/pappa@dator5.(none)
3e6b0b0bda BUG#21350: No errors on using erroneus DATA DIRECTORY clause 
set_up_table_before_create can fail due to erroneus path to
data directory or index directory
Added abort handling to ensure created partitions are dropped
if a failure occurs in the middle of the create process.
 2006-08-07 06:22:08 -04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
7ff64de172 Merge mysql.com:/usr/home/bar/mysql-4.1.b19741v0 
into  mysql.com:/usr/home/bar/mysql-4.1.b19741
 2006-08-07 13:15:23 +05:00
holyfoot/hf@mysql.com/deer.(none)
eab37de051 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.clean
 2006-08-07 11:57:53 +05:00
holyfoot/hf@mysql.com/deer.(none)
ffe2a431b5 information_schema_db.test fixed 2006-08-07 11:56:22 +05:00
tnurnberg@mysql.com/salvation.intern.azundris.com
f25bf84cf4 grant.result: 
manual merge
 2006-08-07 04:13:05 +02:00
tnurnberg@mysql.com/salvation.intern.azundris.com
f17b889289 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/tnurnberg/work/mysql-5.0-maint-20214
 2006-08-07 01:39:05 +02:00
msvensson@neptunus.(none)
1d2a5c2e1a Send output from mysql_client_test to var/log/mysql_client_test.log 2006-08-06 20:58:30 +02:00
mikael/pappa@dator5.(none)
db2c48b08d BUG#21339: Crash at EXPLAIN PARTITIONS 
Caused by missing check for end of partitions in prune range check
 2006-08-05 16:12:24 -04:00
rburnett@bk-internal.mysql.com
86d74dc6dc Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-04 19:19:26 +02:00
rburnett@bk-internal.mysql.com
91c118e224 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-04 19:17:17 +02:00
andrey@lmy004.
9c59cfe4d7 Fix for bug#21416 SP: Recursion level higher than zero needed for non-recursive call 
The following procedure was not possible if max_sp_recursion_depth is 0
create procedure show_proc() show create procedure show_proc;

Actually there is no recursive call but the limit is checked.

Solved by temporarily increasing the thread's limit just before the fetch from cache
and decreasing after that.
 2006-08-04 12:50:49 +02:00
petr/cps@owlet.
af461de728 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-curs-bug
 2006-08-04 14:48:51 +04:00
tsmith@maint1.mysql.com
a4eb61b88c Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
 2006-08-04 00:40:30 +02:00
tsmith@maint1.mysql.com
d6c4c3bad2 Manual merge resolve, part 6 of 6+ 2006-08-03 19:43:52 +02:00
msvensson@neptunus.(none)
34d48ce10a Use "--source" command instead of "source", makes mysql-test-run.pl dtecte this as test case that need binlog format row. 2006-08-03 19:35:00 +02:00
tsmith@maint1.mysql.com
e0b9910728 Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-a 
into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
 2006-08-03 19:28:20 +02:00
petr/cps@mysql.com/owlet.
be2ce2614b Fix Bug #18559 "log tables cannot change engine, and 
gets deadlocked when dropping w/ log on"

Log tables rely on concurrent insert machinery to add data.
This means that log tables are always opened and locked by
special (artificial) logger threads. Because of this, the thread
which tries to drop a log table starts to wait for the table
to be unlocked. Which will happen only if the log table is disabled.
Alike situation happens if one tries to alter a log table.
However in addition to the problem above, alter table calls
check_if_locking_is_allowed() routine for the engine. The
routine does not allow alter for the log tables. So, alter
doesn't start waiting forever for logs to be disabled, but 
returns with an error.
Another problem is that not all engines could be used for
the log tables. That's because they need concurrent insert.

In this patch we:
(1) Explicitly disallow to drop/alter a log table if it
    is currently used by the logger.
(2) Update MyISAM to support log tables
(3) Allow to drop log tables/alter log tables if log is
    disabled
At the same time we (4) Disallow to alter log tables to
unsupported engine (after this patch CSV and MyISAM are 
alowed)
Recommit with review fixes.
 2006-08-03 21:28:15 +04:00
tsmith@maint1.mysql.com
b9ac526884 5.0 -> 5.1 manual merge, part 5 of 5 (or more?) 2006-08-03 19:27:00 +02:00
msvensson@neptunus.(none)
583675f292 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-03 19:18:24 +02:00