mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46801 commits 2793 branches 343 tags 1.7 GiB
Commit graph

46801 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaa@polly.local
c48b9d6cff Merge polly.local:/home/kaa/src/maint/bug28895/my50-bug28895 
into  polly.local:/home/kaa/src/maint/bug28895/my51-bug28895
 2007-06-06 21:44:05 +04:00
kaa@polly.local
35dd1fc535 Fix for bug #28895 "Test 'information_schema_db' fails on i5/OS 32 bit". 
In acl_getroot_no_password(), use a separate variable for traversing the acl_users list so that the last entry is not used when no matching entries are found.
 2007-06-05 22:18:07 +04:00
iggy@amd64.(none)
2cdb525f9f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  amd64.(none):/src/bug24400/my51-bug24400
 2007-06-04 12:53:18 -04:00
iggy@amd64.(none)
375dff28cb Merge amd64.(none):/src/bug24400/my50-bug24400 
into  amd64.(none):/src/bug24400/my51-bug24400
 2007-06-04 12:49:19 -04:00
iggy@amd64.(none)
9346e9246a Merge amd64.(none):/src/bug24400/my41-bug24400 
into  amd64.(none):/src/bug24400/my50-bug24400
 2007-06-04 12:47:48 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c67f70f13 after-merge fix. 2007-06-04 11:52:14 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a4e6061a4c Merge mysql.com:/home/ram/work/b28652/b28652.5.0 
into  mysql.com:/home/ram/work/b28652/b28652.5.1
 2007-06-04 10:14:28 +05:00
iggy@amd64.(none)
e411ccf88c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  amd64.(none):/src/bug24732/my51-bug24732
 2007-06-02 21:24:59 -04:00
msvensson@pilot.(none)
64761758a3 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-02 09:06:21 +02:00
msvensson@pilot.(none)
be55062f64 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-02 09:05:37 +02:00
iggy@amd64.(none)
586c5b430e Post Merge fixup. 2007-06-01 20:37:45 -04:00
iggy@amd64.(none)
2147bb1549 Merge amd64.(none):/src/bug24732/my50-bug24732 
into  amd64.(none):/src/bug24732/my51-bug24732
 2007-06-01 16:49:02 -04:00
iggy@amd64.(none)
5fc6a73b56 Bug #24732 Executables do not include Vista manifests 
- Cleanup typo.
- Make sure to only embedded four part numberic version.
 2007-06-01 16:48:23 -04:00
msvensson@pilot.(none)
9fd2b5ffaf Move code after variable delcaration 2007-06-01 19:57:26 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2b2a80733d Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations 
Problem: we may create a deadlock committing changes in the mysql_alter_table() when 
LOCK_open is set. Moreover, "in some variants of the ALTER TABLE commit
happens earlier, outside of LOCK_open, in other later - inside. It's no good, a storage 
engine code that is called in between could expect a consistency - either there is a 
transaction or there is not".
Fix: move the commit to happen earlier and outside of the LOCK_open.
 2007-06-01 22:53:50 +05:00
msvensson@pilot.(none)
7c15ac32b0 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-01 15:43:47 +02:00
msvensson@pilot.(none)
583a126660 Merge pilot.(none):/data/msvensson/mysql/bug28373/my50-bug28373 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-01 15:43:04 +02:00
msvensson@pilot.(none)
a715a5d7be Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-01 15:19:16 +02:00
msvensson@pilot.(none)
332302ed18 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-01 15:18:46 +02:00
msvensson@pilot.(none)
146e087186 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-01 14:53:58 +02:00
msvensson@pilot.(none)
721d25f8ab Merge pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-01 14:49:21 +02:00
msvensson@pilot.(none)
8ed65b97e1 Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-01 14:35:47 +02:00
msvensson@pilot.(none)
92675afc77 Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_value 
into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
 2007-06-01 14:35:30 +02:00
msvensson@pilot.(none)
f6b5eb54b5 Merge pilot.(none):/data/msvensson/mysql/my51-m-bug24168 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-01 14:34:26 +02:00
msvensson@pilot.(none)
cc45f1b79a Bug #24168 mysql-test-run not functioning in autotest (cannot use external cluster) 
- Removed the global variable(s) glob_use_running_cluster/slave
   and put a property on each "cluster" called "use_running" which
   is set to 1 if user passed either ndb_connectstring or 
   ndb_connectstring_slave. Thus mtr.pl should not start/stop the
   cluster.
 2007-06-01 14:32:26 +02:00
msvensson@pilot.(none)
aede6302af Fiux syntax errors in grant.test, connect command with both -- and ; 
only one of those is allowed
 2007-06-01 14:12:16 +02:00
msvensson@pilot.(none)
1b6d413a2f Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497 
into  pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497
 2007-06-01 13:50:59 +02:00
msvensson@pilot.(none)
fd1c544384 Add missing semicolon after connect command 2007-06-01 13:39:54 +02:00
msvensson@pilot.(none)
62f71f5d7a Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497 
into  pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497
 2007-06-01 12:38:54 +02:00
msvensson@pilot.(none)
91170035d9 Turn query_logging back on to avoid sideeffects in folloing test section 2007-06-01 12:38:41 +02:00
msvensson@pilot.(none)
d43153f274 Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_value 
into  pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497
 2007-06-01 12:04:05 +02:00
msvensson@pilot.(none)
09c5c03cb2 Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test failures 
- Add funtion "query_get_value to allow reading a fields value
   into a $variable
 2007-06-01 12:01:42 +02:00
msvensson@pilot.(none)
42deaca611 Bug#28373 mysqltest test case fails with binlog disabled 
- Update tests to be independent how the mysqld was started
 2007-05-31 15:58:22 +02:00
kaa@polly.local
ca25403ca1 Merge polly.local:/home/kaa/src/maint/bug27643/my51-bug27643 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-05-31 16:07:17 +04:00
kaa@polly.local
7d2d483615 Corrected the error codes and messages for 5.1. This is to fix PB failures introduced by the patch for bug #27643. 2007-05-31 16:04:58 +04:00
kaa@polly.local
1239481b13 Merge polly.local:/home/kaa/src/maint/bug27643/my51-bug27643 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-05-31 15:05:11 +04:00
kaa@polly.local
054da00167 Merge polly.local:/home/kaa/src/maint/bug27643/my50-bug27643 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-05-31 15:01:49 +04:00
kaa@polly.local
16f7290359 Merge polly.local:/home/kaa/src/maint/bug27643/my50-bug27643 
into  polly.local:/home/kaa/src/maint/bug27643/my51-bug27643
 2007-05-31 14:58:22 +04:00
kaa@polly.local
d435b3ed74 Fix for bug #27643 "query failed : 1114 (The table '' is full) 
Problem:

HASH indexes on VARCHAR columns with binary collations did not ignore trailing spaces from strings before comparisons. This could result in duplicate records being successfully inserted into a MEMORY table with unique key constraints.

As a direct consequence of the above, internal MEMORY tables used for GROUP BY calculation in testcases for bug #27643 contained duplicate rows which resulted in duplicate key errors when converting those temporary tables to MyISAM. Additionally, that error was incorrectly converted to the 'table is full' error.

Solution:

- ignore trailing spaces in VARCHAR fields with binary collations when calculating hashes.
- return a proper error from create_myisam_from_heap() when conversion fails.
 2007-05-31 14:54:44 +04:00
kaa@polly.local
f1029f99af Merge polly.local:/home/kaa/src/maint/bug28121/my51-bug28121 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-05-31 12:51:02 +04:00
kaa@polly.local
b729e8e2ac Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-05-31 12:27:12 +04:00
kaa@polly.local
ab37c16a5a Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121 
into  polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
 2007-05-31 12:21:21 +04:00
tsmith@quadxeon.mysql.com
c57839166c Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-31 01:02:56 +02:00
tsmith@quadxeon.mysql.com
298e5002e3 mysqldump.c: 
Fix harmless typo (caught thanks to warning)
 2007-05-31 00:40:56 +02:00
tsmith@quadxeon.mysql.com
e97729a38f mysqldump.c: 
Fix harmless typo (caught thanks to warning)
 2007-05-31 00:37:41 +02:00
tsmith@quadxeon.mysql.com
c1c60a17dc Merge tsmith.mysql.internal:m/bk/maint/b4858/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-31 00:29:02 +02:00
tsmith@quadxeon.mysql.com
91c484339c Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-30 23:48:20 +02:00
tsmith@quadxeon.mysql.com
64f582396b Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-05-30 23:46:21 +02:00
tsmith@quadxeon.mysql.com
d12181e9d0 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
 2007-05-30 23:45:34 +02:00
dkatz@damien-katzs-computer.local
6490419bb6 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-05-30 16:45:54 -04:00