mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
28504 commits 2778 branches 343 tags 1.6 GiB
Commit graph

28504 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@mysql.com
eae275ea46 Disable a few failing NDB tests until they can be investigated 2005-11-29 10:22:17 -08:00
joerg@mysql.com
18a3374347 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M51/merge-5.1 2005-11-29 17:05:48 +01:00
knielsen@mysql.com
84d6dc67e4 Merge mysql.com:/usr/local/mysql/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2005-11-29 13:58:33 +01:00
knielsen@mysql.com
4fc659bf49 Moved long running query to type_newdecimal-big.test 
Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups
[Backported from mysql-5.1-new @1.1961.1.1]
 2005-11-29 13:42:45 +01:00
bar@mysql.com
23c4c3abc0 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2005-11-29 09:30:29 +04:00
bar@mysql.com
0f73558ee3 Merge mysql.com:/usr/home/bar/mysql-4.1.b10446 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-11-29 09:25:51 +04:00
bar@mysql.com
5c1ba75cfd Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b10446
 2005-11-29 09:21:57 +04:00
brian@zim.(none)
22183f2342 Fixed typo where I did --replace-names intead of --replace. 
Thanks Paul for pointing it out :)
 2005-11-28 19:44:55 -08:00
jimw@mysql.com
1a391f71f5 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-28 12:55:27 -08:00
pem@mysql.com
632d497c23 Updated show_check.result. 2005-11-28 21:27:46 +01:00
knielsen@mysql.com
fc1ee24f8a Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2005-11-28 20:42:26 +01:00
pem@mysql.com
b2a9961abf Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new
 2005-11-28 20:14:12 +01:00
jimw@mysql.com
5f7e5b46c6 Merge mysql.com:/home/jimw/my/mysql-4.1-5792 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-28 10:52:52 -08:00
jimw@mysql.com
9df4951acb Merge mysql.com:/home/jimw/my/mysql-5.0-14956 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-28 10:51:54 -08:00
jimw@mysql.com
99297e44d4 Merge mysql.com:/home/jimw/my/mysql-4.1-14155 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-28 10:50:23 -08:00
joerg@mysql.com
379d3ee98c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-11-28 17:26:56 +01:00
joerg@mysql.com
fc57b9c548 Merge mysql.com:/M50/testbugs-5.0 into mysql.com:/M50/mysql-5.0 2005-11-28 17:17:17 +01:00
joerg@mysql.com
41e9dc8352 mysql-test/t/alter_table.test 
Care for case-insignificant platforms (Mac OS X, Windows).
 2005-11-28 17:07:54 +01:00
msvensson@devsrv-b.mysql.com
ba8d1f134a Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
 2005-11-28 16:40:17 +01:00
knielsen@mysql.com
f0c5aae500 Merge mysqldev@production:my/mysql-4.1.16-fixes 
into  mysql.com:/usr/local/mysql/mysql-4.1
 2005-11-28 16:35:28 +01:00
knielsen@mysql.com
ce63d425b2 Merge mysqldev@production:my/mysql-4.1.16-fixes 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2005-11-28 16:29:07 +01:00
msvensson@neptunus.(none)
9a84dcc1ac Include libyassl.la and libtaocrypt.la in libmysqlclient.la 2005-11-28 16:28:00 +01:00
knielsen@mysql.com
eb34dafb1f Merge mysql.com:/usr/local/mysql/mysql-4.1 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2005-11-28 16:15:43 +01:00
pem@mysql.com
341f941209 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14643/mysql-5.0
 2005-11-28 15:11:26 +01:00
reggie@fedora.(none)
c171f8c6c6 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  fedora.(none):/home/reggie/bk/mysql-5.1-new
 2005-11-28 08:07:56 -06:00
joerg@mysql.com
a27a1f0ad3 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2005-11-28 15:07:55 +01:00
knielsen@mysql.com
9248dfc840 Minor Win32 compile fixes for 4.1.16 release. 2005-11-28 15:07:20 +01:00
joerg@mysql.com
8b7bf42061 Merge mysql.com:/M51/tmp-5.1 into mysql.com:/M51/mysql-5.1 2005-11-28 14:56:03 +01:00
joerg@mysql.com
47f298a847 sql/mysqld.cc 
Fix a typo: "distibution" -> "distribution".
 2005-11-28 14:54:41 +01:00
bar@mysql.com
2b18be14ca Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
 2005-11-28 17:16:39 +04:00
bar@mysql.com
814f6c6cf0 grant.result: 
After merge fix.
 2005-11-28 17:06:57 +04:00
pem@mysql.com
df553710df Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14643/mysql-5.0
 2005-11-28 13:20:15 +01:00
bar@mysql.com
8f33adc13d Merge mysql.com:/usr/home/bar/mysql-4.1.b14406 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-11-28 15:31:11 +04:00
bar@mysql.com
5ab6d98e98 Merge mysql.com:/usr/home/bar/mysql-5.0.b14146.sep 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2005-11-28 15:03:41 +04:00
bar@mysql.com
1263105c43 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.param
 2005-11-28 12:49:00 +04:00
bar@mysql.com
63b038f2e6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
 2005-11-28 12:45:40 +04:00
kent@mysql.com
114cf11218 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-11-28 09:44:47 +01:00
bar@mysql.com
4ac260ae27 item.cc, item.h: 
Fixing Item_param::safe_charset_converter to do less "new"s.
 2005-11-28 12:41:44 +04:00
reggie@fedora.(none)
359516fde1 Added myself to authors table for 5.1 2005-11-27 09:06:46 -06:00
lars@mysql.com
97b6713a59 Added my name 
Changed to alphabetical order
 2005-11-27 13:58:50 +01:00
serg@serg.mylan
8d6811def7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-27 09:39:45 +01:00
igor@rurik.mysql.com
5c93bf90f3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2005-11-26 13:54:21 -08:00
serg@serg.mylan
1cf71d0585 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-26 20:56:05 +01:00
serg@serg.mylan
c246aa1635 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-11-26 20:50:22 +01:00
igor@rurik.mysql.com
a87477d1ec Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-11-26 11:28:16 -08:00
serg@serg.mylan
6a83b75764 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-26 20:23:20 +01:00
serg@serg.mylan
701de9be0a followup for for the bug#5686 2005-11-26 19:36:11 +01:00
dlenev@mysql.com
ca8c984e50 Enabled back bunch of tests for stored routines which were disabled 
earlier because of various features/checks missing (these features/checks
are now implemented).
 2005-11-26 19:15:17 +03:00
knielsen@mysql.com
96dcdcc764 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/tmp/x/mysql-5.1-new
 2005-11-26 15:30:09 +01:00
serg@serg.mylan
122b597fc3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-26 08:56:59 +01:00