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
47115 commits 2778 branches 343 tags 1.6 GiB
Commit graph

47115 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@rama.(none)
51a1ebe850 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2007-06-07 15:21:52 -07:00
msvensson@pilot.(none)
bbd7ed0287 Add "have_log_bin" requirement for fast skip when running without binlog 2007-06-07 20:35:32 +02:00
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
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
"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
"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
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
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
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
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
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
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
jimw@rama.(none)
3c93323d28 Bug #28842 Different 'duplicate key' error code between 5.0 and 5.1 
The patch for WL 1563 added a new duplicate key error message so that the
  key name could be provided instead of the key number. But the error code
  for the new message was used even though that did not need to change.

  This could cause unnecessary problems for applications that used the old
  ER_DUP_ENTRY error code to detect duplicate key errors.
 2007-06-06 10:57:07 -07:00
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
tsmith@quadxeon.mysql.com
13adcedc90 mtr_report.pl: 
Add another exception to the acceptable mysqld errors, for test case for bug 28436
 2007-06-06 03:49:24 +02:00
tsmith@quadxeon.mysql.com
60f6e71ef8 ctype-bin.c: 
Post-merge fix warning
 2007-06-06 00:22:35 +02:00
tsmith@quadxeon.mysql.com
6d86790711 sql_prepare.cc: 
Post-merge fix (byte -> uchar)
 2007-06-05 23:56:02 +02:00
tsmith@quadxeon.mysql.com
dad35dc1c1 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 23:24:05 +02:00
tsmith@quadxeon.mysql.com
0ca0984f59 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 23:06:43 +02:00
tsmith@quadxeon.mysql.com
d2fe24d1ef Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
 2007-06-05 23:04:40 +02:00
tsmith@quadxeon.mysql.com
016bff8adc Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 22:49:22 +02:00
tsmith@quadxeon.mysql.com
173d07de78 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
 2007-06-05 22:47:14 +02: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
tsmith@quadxeon.mysql.com
4b93804592 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
 2007-06-05 17:51:30 +02:00
tsmith@quadxeon.mysql.com
502320ef05 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
 2007-06-05 17:28:49 +02:00
iggy@amd64.(none)
9317cd4c2d Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  amd64.(none):/src/bug24400/my41-bug24400
 2007-06-04 13:02:41 -04:00
iggy@amd64.(none)
2e892d30f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  amd64.(none):/src/bug24400/my50-bug24400
 2007-06-04 12:56:15 -04:00