mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
42202 commits 2776 branches 343 tags 1.6 GiB
Commit graph

42202 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
7a8334edfb Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2007-01-29 17:54:41 +01:00
msvensson@neptunus.(none)
751d00c47e Import latest version of yaSSL 
- Replace SawTooth copyright header with MySQL's
 - Bug#19209 Test 'rpl_openssl' hangs on Windows
 - Spurious "2013 Connection to server lost" errors fixed
   yaSSL doesn't close socket anymore, that is left to the application
 2007-01-29 16:54:40 +01:00
kaa@polly.local
46b3a3d7dd Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-01-25 15:50:26 +03:00
kaa@polly.local
e914eb690c Merge polly.local:/tmp/maint/bug6774/my51-bug6774 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-01-24 17:34:31 +03:00
iggy@recycle.(none)
d554b1f725 Merge recycle.(none):/src/bug24496/my51-bug24496 
into  recycle.(none):/src/mysql-5.1-maint
 2007-01-24 09:29:05 -05:00
kaa@polly.local
866ab1c205 Merge polly.local:/tmp/maint/bug6774/my50-bug6774 
into  polly.local:/tmp/maint/bug6774/my51-bug6774
 2007-01-24 17:12:42 +03:00
kaa@polly.local
645de0c5d7 Added a test case for bug #6774 "Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES" 2007-01-24 16:45:30 +03:00
iggy@recycle.(none)
fc66e47247 Merge recycle.(none):/src/bug24496/my50-bug24496 
into  recycle.(none):/src/bug24496/my51-bug24496
 2007-01-23 10:10:08 -05:00
iggy@recycle.(none)
a0c981d254 Bug#24496:Fresh install of mysql on windows has anonymous user with root access. 
- Add anonymous user with no rights.
 2007-01-23 10:01:56 -05:00
tsmith@quadxeon.mysql.com
ac07828bc4 Merge bk://localhost:5556 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-01-23 02:30:48 +01:00
mtaylor@qualinost.(none)
ca99aa7093 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-22 08:46:12 -08:00
msvensson@neptunus.(none)
cff8f55088 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-01-22 16:58:21 +01:00
msvensson@neptunus.(none)
1ebe4850d6 Import yaSSL version 1.5.8 
- Includes patch for Bug#25189
 2007-01-22 16:54:40 +01:00
msvensson@neptunus.(none)
4bb6151a7a Add define for used type of third argument to 'accept' - Netware uses size_t 2007-01-22 12:34:39 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
df4cfc0bc1 after-merge fix. 2007-01-22 15:26:49 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
1d9c8c8a3d Merge mysql.com:/home/ram/work/b22026/b22026.5.0 
into  mysql.com:/home/ram/work/b22026/b22026.5.1
 2007-01-22 14:58:36 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
a079f20aa8 Fix for bug #22026: Warning when using IF statement and large unsigned bigint 
We use INT_RESULT type if all arguments are of type INT for 'if', 'case', 
'coalesce' functions regardless of arguments' unsigned flag, so sometimes we can
exceed the INT bounds.
 2007-01-22 14:52:23 +04:00
msvensson@neptunus.(none)
6db5790c2b gen_lex_hash does not need to link with odbc32*.lib 2007-01-22 10:41:36 +01:00
msvensson@neptunus.(none)
742af1c2a7 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-01-22 10:37:59 +01:00
knielsen@ymer.(none)
f2bbf5225a Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint 
into  ymer.(none):/usr/local/mysql/x/mysql-5.1-new-maint
 2007-01-22 09:00:20 +01:00
knielsen@ymer.(none)
854ef6b0a3 Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint 
into  ymer.(none):/usr/local/mysql/x/mysql-5.0-maint
 2007-01-22 08:59:26 +01:00
tsmith@siva.hindu.god
d71ae463ca Merge siva.hindu.god:/home/tsmith/m/inno/jan20/50 
into  siva.hindu.god:/home/tsmith/m/inno/jan20/51
 2007-01-21 20:30:54 -07:00
tsmith@siva.hindu.god
170296921f Merge siva.hindu.god:/home/tsmith/m/inno/jan20/50 
into  siva.hindu.god:/home/tsmith/m/inno/jan20/51
 2007-01-21 20:09:32 -07:00
tsmith@siva.hindu.god
fd4305e772 Merge siva.hindu.god:/home/tsmith/m/inno/jan20/50 
into  siva.hindu.god:/home/tsmith/m/inno/jan20/51
 2007-01-21 20:07:52 -07:00
tsmith@siva.hindu.god
6cb4282fd8 Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41 
into  siva.hindu.god:/home/tsmith/m/inno/jan20/50
 2007-01-21 20:05:21 -07:00
tsmith@siva.hindu.god
70119a1627 Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41 
into  siva.hindu.god:/home/tsmith/m/inno/jan20/50
 2007-01-21 20:02:24 -07:00
tsmith@siva.hindu.god
b448b62278 Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots 
Fixes:
- Bug #24299: 
- Bug #25596:
 2007-01-21 19:55:17 -07:00
tsmith@siva.hindu.god
bcc8452782 Applied innodb-5.1-ss1186 
Fixes bugs:
- Bug #20877: InnoDB data dictionary memory footprint is too big
- Bug #24741: existing cascade clauses disappear when adding foreign keys
 2007-01-21 18:18:11 -07:00
tsmith@siva.hindu.god
7ce6170cf9 Applied innodb-5.0-ss1230 snapshot 
Fixes:
- Bug #25596:
 2007-01-21 17:58:02 -07:00
mtaylor@qualinost.(none)
04a63996f4 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-21 12:15:20 -08:00
mtaylor@qualinost.(none)
d9366f9743 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2007-01-19 17:36:05 -08:00
mtaylor@qualinost.(none)
72a6096eb4 Moving version-script to acinclude.m4 2007-01-19 17:34:47 -08:00
mtaylor@qualinost.(none)
c77cebec11 files are in storage/ndb in 5.1. fix merge from 5.0 2007-01-19 17:06:53 -08:00
mtaylor@qualinost.(none)
8778f60112 We only want to do these things if we are building Ndb. 2007-01-19 17:02:46 -08:00
mtaylor@qualinost.(none)
9e24d548b6 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-19 16:58:03 -08:00
mtaylor@qualinost.(none)
dab88cfaa3 Fixed the make distcheck problem. We only really need to create libndb.ver if we are building Ndb. 2007-01-19 16:54:01 -08:00
mtaylor@qualinost.(none)
14c3bfa908 One final time making the path right. 2007-01-19 14:58:08 -08:00
mtaylor@qualinost.(none)
d29c6a2547 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-19 14:30:41 -08:00
mtaylor@qualinost.(none)
d116ff2973 Merge recycle.(none):/src/bug22807/my50-bug22807 
into  recycle.(none):/src/mysql-5.0-maint
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
---
I cut and pasted in the wrong direction I think. We don't have storage until 5.1... 
---
missed storage in one more place
---
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
---
added storage back to patch after merge from 5.0-maint
---
Removed ndb/src dir and libndb.ver.in from it that got introduced from the 5.0-maint merge.
 2007-01-19 14:29:01 -08:00
mtaylor@qualinost.(none)
8e6f3ab33b Added libndb.ver to BUILT_SOURCES to force it to get removed during make distclean 2007-01-19 14:26:06 -08:00
mtaylor@qualinost.(none)
8b1fe92d93 missed storage in one more place 2007-01-19 12:27:59 -08:00
mtaylor@qualinost.(none)
4d9abb4a4f I cut and pasted in the wrong direction I think. We don't have storage until 5.1... 2007-01-19 12:23:06 -08:00
mtaylor@qualinost.(none)
58d09b5403 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-19 12:01:52 -08:00
mtaylor@qualinost.(none)
9477996337 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2007-01-19 12:00:19 -08:00
mtaylor@qualinost.(none)
a53b50d021 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
 2007-01-19 11:50:59 -08:00
iggy@recycle.(none)
205f7a0583 Merge recycle.(none):/src/bug22807/my50-bug22807 
into  recycle.(none):/src/mysql-5.0-maint
 2007-01-19 13:20:52 -05:00
iggy@recycle.(none)
0343fd801c Merge recycle.(none):/src/bug22807/my51-bug22807 
into  recycle.(none):/src/mysql-5.1-maint
 2007-01-19 13:19:12 -05:00
iggy@recycle.(none)
d6d5195cbd Merge recycle.(none):/src/bug22807/my50-bug22807 
into  recycle.(none):/src/bug22807/my51-bug22807
 2007-01-19 13:11:03 -05:00
iggy@recycle.(none)
d3e6cb6b3b Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces 
- Corrected compiler warnings and performance problems with new 
dynstr_append_os_quoted function.
 2007-01-19 13:09:48 -05:00
cmiller@zippy.cornsilk.net
80e1798521 Add missing version delimiter. 2007-01-19 11:30:40 -05:00