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
21831 commits 2784 branches 343 tags 1.6 GiB
Commit graph

21831 commits

This branch
This branch
All branches
Author SHA1 Message Date
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)
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
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
hf@deer.(none)
a8f80a8001 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.errmsg
 2005-04-07 19:30:14 +05:00
hf@deer.(none)
345b6d476a Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.errmsg
 2005-04-07 19:25:13 +05:00
sergefp@mysql.com
280fda6093 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug8877-merge
 2005-04-07 17:48:42 +04: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
3005323e99 Merge mysql.com:/home/psergey/mysql-4.1-bug8877 
into mysql.com:/home/psergey/mysql-5.0-bug8877-merge
 2005-04-07 17:46:08 +04:00
sergefp@mysql.com
0cd5877b02 Post-review fixes: local variable renamed 2005-04-07 17:44:48 +04:00
sergefp@mysql.com
b591d3434a BUG#8877: Post-merge fixes. 2005-04-07 17:42:32 +04:00
magnus@msdesk.mysql.com
7de662074a Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into msdesk.mysql.com:/home/magnus/mysql-5.0
 2005-04-07 15:13:03 +02:00
magnus@msdesk.mysql.com
fb1827d623 Merge msdesk.mysql.com:/home/magnus/mysql-5.0-build 
into msdesk.mysql.com:/home/magnus/mysql-5.0
 2005-04-07 15:11:30 +02:00
magnus@msdesk.mysql.com
9911194a13 Fix linking problem on bsd53 
- See article http://archive.netbsd.se/?ml=freebsd-current&a=2004-07&m=257561
  or http://www.geocrawler.com/archives/3/254/2003/3/450/10409564/
 2005-04-07 14:39:30 +02:00
bar@mysql.com
b950bc210c ctype-eucjpms.c: 
After merge fix.
 2005-04-07 16:14:45 +05:00
jani@ua141d10.elisa.omakaista.fi
18354f4570 A small fix to Makefile.am 2005-04-07 13:20:15 +03:00
mskold@mysql.com
934f458140 Added missing DBUG_RETURNs 2005-04-07 12:12:03 +02:00
dlenev@brandersnatch.localdomain
8d05aa0f02 Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal 
state" to sp-error.test.

According to Per-Erik all SP related tests which should result in error
should go into sp-error.test and not in sp.test, because we want to be
able to run sp.test using normal client.
 2005-04-07 11:57:47 +04:00
dlenev@mysql.com
f374b21d07 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bg9566
 2005-04-07 10:41:07 +04:00
jimw@mysql.com
4caef066c7 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-04-06 15:24:12 -07:00
dlenev@brandersnatch.localdomain
d85bed1121 Fix for bug #9566 "explicit LOCK TABLE and store procedures result in 
illegal state".

We should not assume that mysql.proc table does not exist if we are
unable to open it under LOCK TABLES or in prelocked mode (and
remember this fact by setting mysql_proc_table_exists to zero).
 2005-04-07 01:40:29 +04:00
serg@serg.mylan
a4025168c7 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-04-06 23:13:29 +02:00
serg@serg.mylan
5cd866610d after merge fix 2005-04-06 23:12:10 +02:00
serg@serg.mylan
e1e5b97dea manually merged 
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually
 2005-04-06 21:19:20 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
96cf703d58 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-new
 2005-04-06 21:56:19 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
288eff45cb Added missing file to Makefile.am 2005-04-06 21:55:34 +03:00
serg@serg.mylan
78332dcf78 merged 2005-04-06 20:20:37 +02:00
konstantin@mysql.com
5f8d71710b Minor fix in cursors execution. 2005-04-06 22:09:43 +04: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
konstantin@mysql.com
4eeaaa90b7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/media/sda1/mysql/mysql-5.0-9520
 2005-04-06 21:49:00 +04:00
konstantin@mysql.com
70aecbb8a4 Refactor parts of do_select() (JOIN execution). 2005-04-06 21:48:16 +04:00
kent@mysql.com
053d3b2897 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-04-06 19:18:47 +02:00
monty@mysql.com
a7c6348192 Fixed errors found during review 2005-04-06 19:43:35 +03:00
kent@mysql.com
2aa8253f70 Merge 2005-04-06 18:19:05 +02:00
hf@deer.(none)
51f0963b8e Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.errmsg
 2005-04-06 21:05:45 +05:00
monty@mysql.com
beb28b27e0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-06 17:23:34 +03:00
monty@mysql.com
49e721677f Fixed errors descovered by valgrind 2.4 
Added suppression file for some valgrind warnings that are not real errors
 2005-04-06 17:22:21 +03:00
joerg@mysql.com
c47ac8590b Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0 2005-04-06 14:15:45 +02:00