database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-19 21:09:40 +03:00
Code Activity
41,673 Commits 3,238 Branches 1,092 Tags
c8bc42ccff63c26bb77d0ed88df9a08b1642f30b
Commit Graph

15774 Commits

Author SHA1 Message Date
skozlov/ksm@mysql.com/virtop.localdomain
5b7c2c91c1 WL#2862 2006-12-17 23:08:04 +03:00
jpipes@shakedown.(none)
777debdc42 Merge shakedown.(none):/home/jpipes/dev/mysql-5.1-maint 
into  shakedown.(none):/home/jpipes/dev/bug21970/my51-bug21970
 2006-12-16 20:47:21 -05:00
kaa@polly.local
f4d09fa4a0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2006-12-16 03:17:50 +03:00
patg@radha.patg.net
2301aff234 WL #3031 
Yet another test result that needed to be regenerated due to new error
messages. This test only runs via ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row rpl_extraCol_innodb
 2006-12-15 09:42:41 -05:00
msvensson@neptunus.(none)
a246eb39bb Bug#24997 warnings test case failure 
- Move the specific test case to a separate file that is run only
   if we have a disabled handler.
 2006-12-15 15:05:50 +01:00
msvensson@neptunus.(none)
5c1612723d Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-15 13:30:20 +01:00
msvensson@neptunus.(none)
e25b1344cd Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-15 13:24:30 +01:00
msvensson@neptunus.(none)
da5e006dda Bug#19209 Test 'rpl_openssl' hangs on Windows 
- Remove check not to run on windows.
 2006-12-15 13:23:45 +01:00
msvensson@neptunus.(none)
8187397f8e Remove junk 2006-12-15 12:54:40 +01:00
kaa@polly.local
61507a3f93 Merge polly.local:/tmp/maint/bug24117/my51-bug24117 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2006-12-15 13:23:05 +03:00
msvensson@neptunus.(none)
e5f395f96c Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-15 11:21:44 +01:00
kaa@polly.local
0af09f10fb Merge polly.local:/tmp/maint/bug24117/my50-bug24117 
into  polly.local:/tmp/maint/bug24117/my51-bug24117
 2006-12-15 13:10:59 +03:00
mskold/marty@linux.site
8753c50e37 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-15 09:59:26 +01:00
mskold/marty@linux.site
10f8e9fbb8 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-12-15 09:06:15 +01:00
mskold/marty@mysql.com/linux.site
532fe009b8 bug#19956 Problems with VARCHAR primary key and BLOB fields:added test case 2006-12-15 09:03:21 +01:00
tsmith/tim@siva.hindu.god
b2ec2103a3 Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-14 17:48:44 -07:00
tsmith/tim@siva.hindu.god
17fb4c5cbd Post-merge fix to symlink.result 2006-12-14 17:47:55 -07:00
jpipes@shakedown.(none)
eb4878d992 Merge shakedown.(none):/home/jpipes/dev/bug21970/my50-bug21970 
into  shakedown.(none):/home/jpipes/dev/bug21970/my51-bug21970
 2006-12-14 19:13:07 -05:00
tsmith/tim@siva.hindu.god
9788de036b Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-14 17:03:44 -07:00
tsmith/tim@siva.hindu.god
9cbe0621b8 Merge siva.hindu.god:/usr/home/tim/m/bk/41 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-14 16:51:12 -07:00
tsmith/tim@siva.hindu.god
8e5be1ad97 myisam.result: a test was moved from the .test file, but the results were not updated. 2006-12-14 16:23:54 -07:00
jpipes@shakedown.(none)
3044ede13c Fix for Bug#21970. 
Added a space between $MASTER_MYPORT and "+ 1" to ensure that the script correctly output 9307 instead of the string "9306+1"
 2006-12-14 18:21:41 -05:00
msvensson@neptunus.(none)
d697f8919a Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-15 00:14:49 +01:00
msvensson@neptunus.(none)
82db3278aa Add support for loading example plugin and add plugin.test 2006-12-15 00:09:56 +01:00
tsmith/tim@siva.hindu.god
6b5bd643a4 Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-14 13:02:12 -07:00
tsmith/tim@siva.hindu.god
8fbfaeb51f Merge siva.hindu.god:/usr/home/tim/m/bk/41 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-14 13:01:08 -07:00
tsmith/tim@siva.hindu.god
126f004a7f Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-14 12:56:57 -07:00
jpipes@shakedown.(none)
bad9af4f58 Fix for Bug#21970. 
The mysql-test-run-shell.sh script was improperly evaluating an expression for setting up multiple masters.

This fix adds the `expr $MASTER_MYPORT + 1` construct to the offending line in order for the expression to evaluate properly and produce 9307 instead of the string "9306+1"
 2006-12-14 14:54:59 -05:00
msvensson@neptunus.(none)
e69df83d8d Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-14 19:32:17 +01:00
kaa@polly.local
feb0e3a0f2 Merge polly.local:/tmp/maint/bug24117/my50-bug24117 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-12-14 21:24:52 +03:00
kaa@polly.local
4162e009cb Fix for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache" 
Problem:
When creating a temporary field for a temporary table in create_tmp_field_from_field(), a resulting field is created as an exact copy of an original one (in Field::new_field()). However, Field_enum and Field_set contain a pointer (typelib) to memory allocated in the parent table's MEM_ROOT, which under some circumstances may be deallocated later by the time a temporary table is used.

Solution:
Override the new_field() method for Field_enum and Field_set and create a separate copy of the typelib structure in there.
 2006-12-14 20:58:07 +03:00
thek@kpdesk.mysql.com
165ae199ab Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2006-12-14 16:09:15 +01:00
patg@radha.patg.net
860c27db19 BUG #25074 
mysql_upgrade test gives inconsitent results
 2006-12-14 10:07:17 -05:00
thek@kpdesk.mysql.com
b19b9333f0 Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
 2006-12-14 16:04:07 +01:00
Kristofer.Pettersson@naruto.
e09e2694d6 Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint 
into  naruto.:C:/cpp/mysql-4.1-maint
 2006-12-14 16:02:43 +01:00
Kristofer.Pettersson@naruto.
aa2c208899 Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  naruto.:C:/cpp/mysql-5.0-maint
 2006-12-14 15:52:06 +01:00
thek@kpdesk.mysql.com
1d14b89871 Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2006-12-14 15:30:00 +01:00
thek@kpdesk.mysql.com
b7fcaadacf Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
 2006-12-14 14:50:08 +01:00
thek@kpdesk.mysql.com
070ff2ac72 Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/bug17489/my51-bug17498
 2006-12-14 13:53:13 +01:00
thek@kpdesk.mysql.com
7e60087441 Bug#17498 failed to put data file in custom directory use "data directory" option 
Merged 4.1->5.0. Updated myisam.test
 2006-12-14 13:45:17 +01:00
thek@kpdesk.mysql.com
c9622dfb0a Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
 2006-12-14 13:38:09 +01:00
df@kahlann.erinye.com
02d6bcaae0 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2006-12-14 13:32:27 +01:00
thek@kpdesk.mysql.com
29f72a0ba1 Bug#17498 failed to put data file in custom directory use "data directory" option 
- When this bug was corrected it changed the behavior 
  for data/index directory in the myisam test case.
- This patch moves the OS depending tests to a non-windows
  test file.
 2006-12-14 13:23:31 +01:00
df@kahlann.erinye.com
95564bfea3 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-14 09:33:27 +01:00
df@kahlann.erinye.com
e0f9996e3d Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-14 09:31:51 +01:00
svoj@mysql.com/april.(none)
a708a3b5a6 After merge fix. 2006-12-13 19:20:34 +04:00
svoj@april.(none)
35e7dea871 Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.1-engines
 2006-12-13 17:32:40 +04:00
svoj@mysql.com/april.(none)
db88cf3df7 Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines
 2006-12-13 16:29:33 +04:00
svoj@mysql.com/april.(none)
f92ae8d6c1 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines
 2006-12-13 15:53:37 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
46e07cc9d2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug22377/my41-bug22377
 2006-12-13 14:05:29 +04:00