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

21898 commits

This branch
This branch
All branches
Author SHA1 Message Date
bar@mysql.com
c6e1a4821e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-04-11 17:06:40 +05:00
pekka@mysql.com
fd5b9f7ed7 ndb - csc#4847 - manual merge 4.1->5.0 2005-04-11 12:43:58 +02:00
bar@mysql.com
71f530c4ea merge 2005-04-11 15:11:52 +05:00
joerg@mysql.com
fc0e6aa274 Manual transfer of the change in "configure.in" (4.1) to "config/ac-macros/character_sets.m4". 2005-04-11 11:24:30 +02:00
joerg@mysql.com
198b6117f9 Proper handling of "utf8-general-cs" clollation: Missing parts in configuration. 2005-04-11 11:12:08 +02:00
joreland@mysql.com
588559e3d8 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-04-11 10:26:18 +02:00
joreland@mysql.com
ed95158337 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-04-11 10:22:30 +02: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
pekka@mysql.com
dbae73bfa8 ndb - testOIBasic.cpp: 4.1->5.0 fix 2005-04-10 07:55:30 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b47f7902d3 New versions of mail_to_db.pl and pmail.pl. 
Added email threading capabilities to both
programs.
 2005-04-09 18:37:32 +03: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
dcc40a080d Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1 
into xiphis.org:/var/db/bk/work-acurtis/bug6776.2
 2005-04-09 00:36:08 +01:00
acurtis@xiphis.org
0998ec4264 Fix typos in Bug#6776 2005-04-09 00:21:51 +01:00
mskold@mysql.com
402ceb3222 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-08 22:49:08 +02: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
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
pem@mysql.comhem.se
2038ced40c Fixed BUG#9073: Able to declare two handlers for same condition in same scope 2005-04-08 19:58:04 +02:00
mskold@mysql.com
0ee6e48b22 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-08 19:57:07 +02:00
mskold@mysql.com
e8f45332bd Merge 2005-04-08 19:42:57 +02:00
pem@mysql.com
e6d72f1c48 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-08 17:32:50 +02:00
pem@mysql.comhem.se
ce2e40ac19 Fixed BUG#6900: Stored procedure inner handler ignored 
and BUG#9074: STORED PROC: The scope of every handler declared is not properly applied
 2005-04-08 17:31:37 +02:00
mskold@mysql.com
497f2684d8 Merge from fix of Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-08 16:49:14 +02: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
pem@mysql.comhem.se
e99da54fd5 Fixed BUG#7299: Stored procedures: exception handler catches not-found conditions 2005-04-08 16:05:16 +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
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
20a82a1a6a Fixed broken auto_increment 2005-04-08 12:34:52 +02:00
mskold@mysql.com
7c38f9d8e7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-08 11:50:01 +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
hf@deer.(none)
eae3f5ba1d Test result fixed 2005-04-08 09:23:10 +05:00
hf@deer.(none)
33cd3168fb Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.errmsg
 2005-04-08 08:31:53 +05:00
monty@mysql.com
211638f539 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-08 00:56:29 +03:00
msvensson@neptunus.(none)
f9dd856d9e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-07 21:29:33 +02:00
lenz@mysql.com
d936a80cea - bumped up the version number in configure.in from 5.0.4 to 5.0.5 to indicate that engineering 
has branched off from the 4.1 tree to build the 5.0.4 release
 2005-04-07 21:04:18 +02:00
monty@mysql.com
551ebb8a60 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-07 22:02:24 +03: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
msvensson@neptunus.(none)
7a0e28feb5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-07 20:19:25 +02:00
msvensson@neptunus.(none)
12b6252145 BUG#6762 ALTER TABLE gives weird results and error message 
- Removed hardcoded error message from 4.1
 2005-04-07 20:17:37 +02:00
mskold@mysql.com
600154704f Merge 2005-04-07 20:10:50 +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
8327593bfd Merge 2005-04-07 19:48:00 +02:00
jimw@mysql.com
43d926029f Add cp932 and eucjpms character sets to Windows build. (Bug #9479) 2005-04-07 09:51:56 -07:00
mskold@mysql.com
e66eaaa2a0 Merge 2005-04-07 18:37:04 +02:00
monty@mysql.com
740cc2e095 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-07 19:25:20 +03:00
monty@mysql.com
780202f130 Moved some old test and added a new test to only be run with mysql-test-run --big 
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files
 2005-04-07 19:24:14 +03: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