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

22098 commits

This branch
This branch
All branches
Author SHA1 Message Date
ingo@mysql.com
692093c041 Hand merge, which needs fixes. 2005-04-20 15:50:29 +02:00
ingo@mysql.com
c179d0c1cc Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug7806
 2005-04-20 15:04:00 +02:00
ingo@mysql.com
8faed37945 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug7806
 2005-04-20 12:24:22 +02:00
msvensson@neptunus.(none)
b26d29a081 After review fix 2005-04-20 12:02:07 +02:00
msvensson@neptunus.(none)
de9ba7b0a5 Merge 2005-04-20 11:59:02 +02:00
sergefp@mysql.com
f284512ce0 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9103
 2005-04-20 12:11:06 +04:00
sergefp@mysql.com
4156f9fa44 BUG#9103 merge to 5.0 2005-04-20 12:09:56 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
ff665c9513 Fixed Bug#8046 --mysqld of mysqld_safe must contain substring "mysqld" 2005-04-20 10:37:03 +03:00
ingo@mysql.com
792b816b1b Bug#7806 - insert on duplicate key and auto-update of timestamp 
Modified the check for the timestamp field so that the flags for
the automatic for inserts and updates are cleared independently.
 2005-04-19 15:12:32 +02:00
joerg@mysql.com
dee14fdd40 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-04-19 14:06:09 +02:00
joerg@mysql.com
91b0f86189 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/push-5.0 2005-04-19 13:53:34 +02:00
msvensson@neptunus.(none)
4a4c9017ad BUG#9568 mysql segfaults from CTRL-R 
- Segfault because of passing a 64-bit pointer to 32 bit integer.
 - Add new include  config_readline.h which will calculate some new defines 
   based on what is found in config.h
 - This file was originally included in readline 4.3 as config.h.in, only the part that
    makes new defines have been moved to this file.
 2005-04-19 13:12:19 +02:00
jan@hundin.mysql.fi
110025e647 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/jan/orig/mysql-5.0
 2005-04-19 14:01:55 +03:00
jan@hundin.mysql.fi
bd10055a7e Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-04-19 13:59:09 +03:00
acurtis@xiphis.org
ba51f96e39 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug9496
 2005-04-19 10:32:04 +01:00
joreland@mysql.com
2df2c4b895 CSC5149 - ndb test programs 
Fix src distributions for benchmark prg
 2005-04-19 11:17:32 +02:00
jan@hundin.mysql.fi
09a425fa19 Merge changes from 4.1.x to 5.0.x. Only a style changes. 2005-04-19 09:38:20 +03:00
jan@hundin.mysql.fi
1f994ec920 Style change. Use 1 and 0 instead of true and false. 2005-04-19 08:23:03 +03:00
igor@rurik.mysql.com
ea9cbd3bb4 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-04-18 14:49:11 -07:00
igor@rurik.mysql.com
60164ced47 view.result: 
Correction after fix for bug #9902.
 2005-04-18 14:44:14 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
1658d737b3 Fixed Bug#6593, "Inconsistency in handling option prefixes (--skip, --disable, etc.)" 2005-04-19 00:22:57 +03:00
acurtis@xiphis.org
1ef7bbc74b Update for VARCHAR and remove 4.1-specific actions. 
by Philip Antoniades
 2005-04-18 22:01:18 +01:00
sergefp@mysql.com
969263cf1d Post merge fix - updated the test results (BUG#9439) 2005-04-18 22:30:22 +04:00
dlenev@mysql.com
855d2376f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-04-18 17:00:02 +04:00
dlenev@mysql.com
8d7eb82a2a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-04-18 16:03:07 +04:00
heikki@hundin.mysql.fi
69d4d438d2 ha_innodb.cc: 
Style fix
 2005-04-18 14:59:25 +03:00
dlenev@brandersnatch.localdomain
03d8c01a4c Fixed test results after merging fix for bug #8068 "TIMEDIFF with first 
negative argument gives wrong result" into 5.0 tree.
 2005-04-18 15:58:58 +04:00
dlenev@mysql.com
49b4af7bf6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
 2005-04-18 15:04:50 +04:00
dlenev@mysql.com
a95ede0527 Manual merge of patch for bug #8068 "TIMEDIFF with first negative 
argument gives wrong result" (and similar bug in ADDTIME/SUBTIME)
into 5.0 tree.
 2005-04-18 14:29:31 +04:00
dlenev@brandersnatch.localdomain
91c482e4a1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
 2005-04-18 13:54:42 +04:00
pem@mysql.com
c8c4ecf462 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-18 11:27:02 +02:00
jan@hundin.mysql.fi
384efc4493 Fixed a bug: deadlock without any locking, simple select and update (Bug #7975). 
Backported from 5.0.3.
 2005-04-18 12:17:32 +03:00
joerg@mysql.com
e66cda03c5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-04-18 10:19:49 +02:00
joerg@mysql.com
40a27edad4 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/clone-5.0.4-build 2005-04-18 10:07:51 +02:00
sergefp@mysql.com
a76ecc5bc7 Fix for BUG#9103: 
Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
is only used to make index search tuples and data truncation that occurs here has no
relation with truncated values being saved into tables.
 2005-04-18 05:21:44 +04:00
sergefp@mysql.com
4ba166e8df Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-look-range
 2005-04-17 21:00:44 +04:00
sergefp@mysql.com
39f412d329 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9439
 2005-04-17 20:56:36 +04:00
sergefp@mysql.com
f9ec5658c7 Merge fix for BUG#9439 from 4.1 2005-04-17 20:54:31 +04:00
lenz@mysql.com
113c883f1d Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0-build
 2005-04-17 13:04:29 +02:00
lenz@mysql.com
5126016d3c Merge mysql.com:/space/my/mysql-4.0-build 
into mysql.com:/space/my/mysql-4.1-build
 2005-04-17 12:48:33 +02:00
lenz@mysql.com
4bc0a01d33 - removed ReadMe.txt from CLEANFILES, as it's cleaned by Docs/Makefile.am 
already (and that's the Makefile that acutally creates it)
 2005-04-17 12:44:59 +02:00
sergefp@mysql.com
ba3795f1d4 Post-merge fixes 2005-04-17 02:10:43 +04:00
sergefp@mysql.com
5147f85c62 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-look-range
 2005-04-17 02:06:17 +04:00
sergefp@mysql.com
2ef1963c91 Fix for BUG#9348: when computing union of two intervals set lower bound to 
minimum of lower bounds of two joined intervals.
 2005-04-17 02:05:09 +04:00
petr@mysql.com
8c3312fed3 mysql.server script fixed to use mysqld_safe by default + lots of minor additions 2005-04-16 23:57:15 +04:00
sergefp@mysql.com
6b4e759cf7 Fix for BUG#9439: 
Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
(this is the final cset with proper tests)
 2005-04-16 23:35:39 +04:00
ingo@mysql.com
e6b8c52808 Merge mysql.com:/home/mydev/mysql-4.1-bug9188 
into mysql.com:/home/mydev/mysql-5.0-bug9188
 2005-04-16 21:01:46 +02:00
ingo@mysql.com
37537b4b2d Merge mysql.com:/home/mydev/mysql-4.1-bug9487 
into mysql.com:/home/mydev/mysql-4.1-bug9188
 2005-04-16 20:56:21 +02:00
ingo@mysql.com
e2356c71c1 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug9487
 2005-04-16 18:56:46 +02:00
ingo@mysql.com
ab0acbe14d Merge 2005-04-16 17:58:11 +02:00