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

47500 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.(none)
d9b259454a Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-07 20:27:19 +02:00
msvensson@pilot.(none)
597c75d2fd Fix typo 
Mark one more test as needing binlog
 2007-06-07 20:25:22 +02:00
msvensson@pilot.(none)
dec3624d1f Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-07 19:59:26 +02:00
msvensson@pilot.(none)
6b80cefbb1 Remove last line, making it possible to merge 2007-06-07 19:59:06 +02:00
msvensson@pilot.(none)
6ca8329d12 Merge pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-07 19:48:34 +02:00
msvensson@pilot.(none)
c0144886bf Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-07 19:37:58 +02:00
igor@olga.mysql.com
d55e54c75a Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28449
 2007-06-07 10:26:38 -07:00
msvensson@pilot.(none)
b8d8e494cd Merge pilot.(none):/data/msvensson/mysql/bug28369/my50-bug28369 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-07 19:21:01 +02:00
msvensson@pilot.(none)
a48e321e37 Bug#28369 rpl test cases fail with binlog disabled 
- Additional tests in 5.1 that need binlog
 - Mark more test to need binlog
 2007-06-07 19:20:49 +02:00
msvensson@pilot.(none)
ad2419050e Merge pilot.(none):/data/msvensson/mysql/bug28369/my50-bug28369 
into  pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369
 2007-06-07 19:19:29 +02:00
msvensson@pilot.(none)
1afb1c8ddf Bug#28369 rpl test cases fail with binlog disabled 
- Turn on binlog only for tests that need it
 - Skip those tests if --skip-binlog is used
 2007-06-07 19:18:01 +02:00
"Reggie"/Reggie@xp.
25f2fa91bf reverting this file to Unix line ending so it will work on Windows 2007-06-07 11:00:35 -05:00
"Reggie"/Reggie@xp.
15a6a18c06 Merge xp.:C:/work/mysql-5.1-new-maint/..\mysql-5.0-maint 
into  xp.:C:/work/mysql-5.1-new-maint
 2007-06-07 10:14:53 -05:00
Reggie@xp.
e0dd20b5a8 setting pre-commit to be Unix only line endings so it will work on Windows 2007-06-07 10:14:47 -05:00
joerg@trift2.
160b784a49 Merge trift2.:/MySQL/M41/bug23504-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-07 17:00:13 +02:00
"Reggie"/Reggie@xp.
64878d0c79 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  xp.:C:/work/mysql-5.0-maint
 2007-06-07 09:53:01 -05:00
joerg@trift2.
ee116570dc Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-07 16:37:15 +02:00
joerg@trift2.
d870247de1 Merge trift2.:/MySQL/M41/bug23504-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-07 16:29:59 +02:00
"Reggie"/Reggie@xp.
e4963e7c37 Bug #24731 Shared memory connections do not work with MySql ran as service on Vista 
The events were not being opened in the global namespace.
 2007-06-07 09:13:56 -05:00
msvensson@pilot.(none)
beb08395ff Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-07 15:27:57 +02:00
msvensson@pilot.(none)
e029485449 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-07 14:33:45 +02:00
msvensson@pilot.(none)
9aa732f1ce Merge pilot.(none):/data/msvensson/mysql/bug28718/my50-bug28718 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-07 14:33:13 +02:00
msvensson@pilot.(none)
91b2650735 Bug#28718 Running backup testcase fails in mysql testsuite 
- Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR
 2007-06-07 14:25:17 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
2616c7b723 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b28806/b28806.5.1
 2007-06-07 16:05:26 +05:00
joerg@trift2.
0d84c3f710 netware/*.def : Allocate 128K stack for all executables (bug#23504) 2007-06-07 12:59:31 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
46f68b228e Fix for bug #28806: Running SHOW TABLE STATUS during high INSERT load crashes server 
Problem: getting an autoincrement value for a partition table in the ::info() method we call
the get_auto_increment() for all partitions. That may cause a problem for at least MyISAM
tables that rely on some table state (in this particular case table->naxt_nuber_field is 
set to 0 in the mysql_insert() and we get a crash). 
Moreover, calling get_auto_increment() is superfluous there.

Fix: use ::info(HA_STATUS_AUTO) calls to get autoincrement values for partitions instead of
get_auto_increment() ones in the ha_partition::info().
 2007-06-07 15:50:13 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
6ee83df5ff bug #28309 First insert violates UNIQUE constraint - was "memory" table empty? 
If we have lower_case_table_names == 2 (usually on case insensitive file
systems) we sometimes make 'homedir' part of the path sent to the
handler into lowercase. So in this case HEAP engine couldn't properly
find and remove HP_SHARE, what caused the bug.
 2007-06-07 14:03:43 +05:00
kaa@polly.local
dcd1832578 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-06-07 12:57:09 +04:00
svoj@june.mysql.com
d0a044a0bf Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
 2007-06-07 13:53:23 +05:00
kaa@polly.local
1760e138c1 Merge polly.local:/home/kaa/src/maint/bug28895/my51-bug28895 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-06-07 12:52:20 +04:00
kaa@polly.local
b51e43bbb0 Fixed tests that relied on broken behavior in acl_getroot_no_password(). 
This is to fix PB failures introduced by the patch for bug #28895.
 2007-06-07 12:45:37 +04:00
msvensson@pilot.(none)
2792966d7c Merge pilot.(none):/data/msvensson/mysql/bug28690/my51-bug28690 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-07 10:00:43 +02:00
msvensson@pilot.(none)
ee9e271420 Merge pilot.(none):/data/msvensson/mysql/bug28690/my50-bug28690 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-07 10:00:23 +02:00
igor@olga.mysql.com
569960410f Fixed bug #28449: a crash may happen at some rare conditions when 
a temporary table has grown out of heap memory reserved for it and 
the remaining disk space is not big enough to store the table as
a MyISAM table.

The crash happens because the function create_myisam_from_heap
does not handle safely the mem_root structure associated 
with the converted table in the case when an error has occurred.
 2007-06-07 00:59:08 -07:00
msvensson@pilot.(none)
5ca0edd73f Merge pilot.(none):/data/msvensson/mysql/bug28690/my50-bug28690 
into  pilot.(none):/data/msvensson/mysql/bug28690/my51-bug28690
 2007-06-07 09:50:53 +02:00
msvensson@pilot.(none)
b5ebfe45ed Bug#28690 mysql-enterprise-gpl-5.0.40-linux-i686-glibc won't start on Debian Sarge 
- Only use the "hack for bug in NTPL" if using NTPL, by dynamically
   checking the thd_lib_detected flag
 2007-06-07 09:48:37 +02:00
msvensson@pilot.(none)
f8c036a052 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-07 09:22:26 +02:00
msvensson@pilot.(none)
7368985cfa Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-07 09:21:33 +02:00
msvensson@pilot.(none)
65919873ff Merge pilot.(none):/data/msvensson/mysql/bug10218/my41-bug10218 
into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
 2007-06-07 09:21:20 +02:00
gkodinov/kgeorge@magare.gmz
e4e141cf58 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28878-5.0-opt
 2007-06-07 10:10:18 +03:00
gkodinov/kgeorge@magare.gmz
b1e936b9e5 Bug#28878: InnoDB tables with UTF8 character set and indexes cause 
wrong result for DML
When making key reference buffers over CHAR fields whitespace (0x20) 
must be used to fill in the remaining space in the field's buffer.
This is what Field_string::store() does.
Fixed Field_string::get_key_image() to do the same.
 2007-06-07 10:08:44 +03:00
svoj@june.mysql.com
c45b4cf893 Merge 81.176.158.240:devel/mysql/BUG26976/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
 2007-06-07 12:07:41 +05:00
kaa@polly.local
c674243497 Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-06-07 10:26:04 +04:00
evgen@moonbone.local
b90901130e Bug#28505: mysql_affected_rows() may return wrong result if CLIENT_FOUND_ROWS 
flag is set.

When the CLIENT_FOUND_ROWS flag is set then the server should return
found number of rows independently whether they were updated or not.
But this wasn't the case for the INSERT statement which always returned
number of rows that were actually changed thus providing wrong info to
the user.

Now the select_insert::send_eof method and the mysql_insert function
are sending the number of touched rows if the CLIENT_FOUND_ROWS flag is set.
 2007-06-07 00:30:00 +04:00
kaa@polly.local
8303cfd9e3 Merge polly.local:/home/kaa/src/maint/bug28895/my51-bug28895 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-06-06 23:47:43 +04:00
acurtis/antony@ltamd64.xiphis.org
1f0aca9626 Merge xiphis.org:/home/antony/work2/mysql-5.0-merge 
into  xiphis.org:/home/antony/work2/mysql-5.1-merge
 2007-06-06 12:25:36 -07:00
acurtis/antony@ltamd64.xiphis.org
aab3427131 Merge xiphis.org:/home/antony/work2/mysql-4.1-engines.merge 
into  xiphis.org:/home/antony/work2/mysql-5.0-merge
 2007-06-06 12:22:56 -07:00
acurtis/antony@ltamd64.xiphis.org
af72b54f3e Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
 2007-06-06 12:03:54 -07:00
acurtis/antony@ltamd64.xiphis.org
5a7f1f8a68 Merge xiphis.org:/home/antony/work2/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
 2007-06-06 12:00:35 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
e112a475bd Merge xiphis.org:/home/antony/work2/mysql-4.1-engines 
into  xiphis.org:/home/antony/work2/mysql-4.1-engines.merge
 2007-06-06 11:51:35 -07:00