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

21679 commits

This branch
This branch
All branches
Author SHA1 Message Date
ramil/ram@mysql.com/myoffice.izhnet.ru
6e91557408 after merge fix. 2007-01-19 12:19:53 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
ce855aba98 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
 2007-01-19 09:12:52 +04:00
tsmith@siva.hindu.god
f5aab8b213 ndb_types.test: sleep a bit longer, to ensure that timestamp > @now 2007-01-18 13:26:26 -07:00
tsmith@siva.hindu.god
5817465426 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
 2007-01-18 10:36:46 -07:00
tsmith@siva.hindu.god
6fd02a439f Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
 2007-01-18 09:53:30 -07:00
tsmith@siva.hindu.god
eec44018b2 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
 2007-01-18 09:32:41 -07:00
tsmith@siva.hindu.god
2dc96063b4 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
 2007-01-18 09:20:25 -07:00
tsmith@siva.hindu.god
4b3840612e Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
 2007-01-18 08:52:45 -07:00
joerg/mysqldev@mysql.com/production.mysql.com
c3ab6de255 Raise version number after cloning 4.0.29 2007-01-18 16:41:32 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c91d648b73 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
 2007-01-18 17:17:03 +04:00
tsmith@siva.hindu.god
d6d7385a18 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
 2007-01-17 16:40:41 -07:00
tsmith@siva.hindu.god
018acedba7 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
 2007-01-17 16:40:17 -07:00
tsmith@siva.hindu.god
fa927d7e05 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
 2007-01-17 16:38:49 -07:00
cmiller@zippy.cornsilk.net
c9a0cccc23 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-01-17 13:34:36 -05:00
lars/lthalmann@mysql.com/dl145j.mysql.com
bbaf32754f Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-01-17 19:28:55 +01:00
cmiller@zippy.cornsilk.net
332f9ff8b4 Bug#23721: compile fails: check-cpu mishandles cpu flags with \ 
hyphen in it (like ds-cpl).

convert illegal chars in cpu flags to '_' for variable assignment
 2007-01-17 13:22:50 -05:00
kostja@bodhi.local
6399db740e Fix a failure of lowercase_tables2 test on powermacg5, introduced 
by the patch for Bug#4968
 2007-01-17 15:46:30 +03:00
msvensson@pilot.mysql.com
29be5ce836 Bug#25505 Myisam library compiler error on Windows 2007-01-17 11:51:52 +01:00
msvensson@pilot.mysql.com
8154355a07 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-01-17 11:13:03 +01:00
kostja@bodhi.local
51a2f5153f A fix for the broken 4.1-runtime tree. 2007-01-16 21:23:52 +03:00
kostja@bodhi.local
d49ac4fbb7 A post-merge fix. 2007-01-15 23:25:16 +03:00
kostja@bodhi.local
d53072d190 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-4.1-4968-to-push
 2007-01-15 13:03:21 +03:00
kostja@bodhi.local
a7862496ce Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2007-01-12 18:06:43 +03:00
joerg@trift2.
4ffada35bf Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  trift2.:/MySQL/M41/mysql-4.1
 2007-01-12 14:40:28 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
22398faa91 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-01-12 12:21:44 +01:00
joerg@trift2.
59e2133e00 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-01-12 10:17:39 +01:00
kostja@bodhi.local
dd03d51f22 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2007-01-11 21:49:52 +03:00
joerg@trift2.
f3025c1122 Merge mysqldev@production.mysql.com:my/mysql-4.0-15815 
into  trift2.:/MySQL/M40/mysql-4.0
 2007-01-11 19:17:27 +01:00
mysqldev@mysql.com/production.mysql.com
eb18787c81 Merge mysqldev@quadxeon:/benchmarks/ext3/TOSAVE/tsmith/bk/g40 
into  mysql.com:/data0/mysqldev/my/mysql-4.0-15815
 2007-01-11 19:04:36 +01:00
joerg@trift2.
671028a44c Merge trift2.:/MySQL/M40/clone-4.0 
into  trift2.:/MySQL/M40/mysql-4.0
 2007-01-11 17:53:38 +01:00
thek@kpdesk.mysql.com
75d91dedac Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2007-01-11 15:16:33 +01:00
thek@kpdesk.mysql.com
55558582ae Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
 2007-01-11 15:14:34 +01:00
thek@kpdesk.mysql.com
1802d5aabb Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2007-01-11 14:11:58 +01:00
thek@kpdesk.mysql.com
0982a1d9b4 Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2007-01-11 14:04:01 +01:00
Kristofer.Pettersson@naruto.
472ff94b4d Merge naruto.:C:/cpp/bug24751/my41-bug24751 
into  naruto.:C:/cpp/mysql-4.1-maint
 2007-01-11 13:13:06 +01:00
kent@mysql.com/kent-amd64.(none)
bd2ec8051d Many files: 
Reverted change for bug#13859, applied smaller patch from Marko
 2007-01-11 12:31:52 +01:00
Kristofer.Pettersson@naruto.
270752654e Bug#24751 - Possible infinit loop in init_io_cache() when insufficient memory 
- When cache memory can't be allocated size is recaclulated using 3/4 of
  the requested memory. This number is rounded up to the nearest 
  min_cache step. 
  However with the previous implementation the new cache size might
  become bigger than requested because of this rounding and thus we get
  an infinit loop.
- This patch fixes this problem by ensuring that the new cache size
  always will be smaller on the second and subsequent iterations until
  we reach min_cache.
 2007-01-11 09:40:17 +01:00
tsmith@quadxeon.mysql.com
0d7120d9b6 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mysql-4.0-bug15815 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g40
 2007-01-11 01:59:11 +01:00
joerg@trift2.
4d12d97cc3 Merge trift2.:/MySQL/M40/clone-4.0 
into  trift2.:/MySQL/M41/push-4.1
 2007-01-10 21:05:13 +01:00
joerg@trift2.
e9f7b6f797 Merge trift2.:/MySQL/M40/upward-4.0 
into  trift2.:/MySQL/M41/push-4.1
 2007-01-10 20:29:14 +01:00
igor@olga.mysql.com
f5f8c35ef2 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-4.1-opt
 2007-01-10 10:49:46 -08:00
gluh@mysql.com/eagle.(none)
b61f3545f5 Fix for bug#20867 InnoDB Bug - create temporary table+crash => mysqld needs to clean up 
2nd version
During tmp tables cleanup we get the handler for temporary table
and delete table using handler method.
 2007-01-10 12:57:03 +04:00
igor@olga.mysql.com
578fae9dc8 Fixed bug #25427. 
In the method Item_field::fix_fields we try to resolve the name of
the field against the names of the aliases that occur in the select
list. This is done by a call of the function find_item_in_list.
When this function finds several occurrences of the field name
it sends an error message to the error queue and returns 0.
Yet the code did not take into account that find_item_in_list
could return 0 and tried to dereference the returned value.
 2007-01-10 00:27:11 -08:00
joerg@trift2.
46a8d14e21 Version 4.0 is in "extended maintenance" by now, and so 
no future build of it will include Berkeley DB:
Remove it from the Windows VC++ project files.
 2007-01-09 17:21:54 +01:00
thek@kpdesk.mysql.com
a73273c758 Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.0
 2007-01-09 14:37:52 +01:00
thek@kpdesk.mysql.com
979c888bdd Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my41-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-build
 2007-01-09 14:36:28 +01:00
thek@kpdesk.mysql.com
98a9706edb Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/bug23010/my41-fix23010
 2007-01-09 12:30:57 +01:00
thek@kpdesk.mysql.com
0906993457 Cset exclude: thek@kpdesk.mysql.com|ChangeSet|20061106104152|07628 2007-01-09 12:28:46 +01:00
kroki/tomash@moonlight.home
69ec67fcd8 Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-bug23443
 2007-01-09 12:47:03 +03:00
kroki/tomash@moonlight.home
e1ea142c0a Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-4.0 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-4.0-bug23443
 2007-01-09 12:46:35 +03:00