1
0
mirror of https://github.com/MariaDB/server.git synced 2025-10-19 21:09:40 +03:00
Commit Graph

16816 Commits

Author SHA1 Message Date
skozlov/ksm@mysql.com/virtop.localdomain
1f10aa10d9 fix for commit 1.2368 2006-12-18 12:52:59 +03:00
msvensson@maint1.mysql.com
6cd4a816bc Use MYSQLTEST_VARDIR variable 2006-12-18 10:22:48 +01:00
skozlov/ksm@mysql.com/virtop.localdomain
4843e335fc fix for commit 1.2368 2006-12-18 09:46:44 +03:00
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
jmiller/ndbdev@mysql.com/ndb08.mysql.com
46e8ad7822 New cluster replication test cases for replication options 2006-12-15 16:34:29 +01: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
gkodinov/kgeorge@macbook.gmz
d56d3a6971 Bug #15439: UDF name case handling forces DELETE FROM mysql.func to remove
the UDF
When deleting a user defined function MySQL must remove it from both the
in-memory hash table and the mysql.proc system table.
Finding (and removal therefore) from the internal hash table is case 
insensitive (or whatever the default charset is), whereas finding and 
removal from the system table is case sensitive.
As a result if you supply a function name that is not in the same character
case to DROP FUNCTION the server will remove the function only from the
in-memory hash table and will keep the row in mysql.proc system table.
This will cause inconsistency between the two structures (that is fixed
only by restarting the server).
Fixed by using the name in the precise case (from the in-memory hash table)
to delete the row in the mysql.proc system table.
2006-12-15 11:38:30 +02: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
monty@mysql.com/narttu.mysql.fi
a6481aa4c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-12-15 01:01:52 +02:00
monty@mysql.com/narttu.mysql.fi
88dd873de0 Fixed compiler warnings detected by option -Wshadow and -Wunused:
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments

Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c

I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
2006-12-15 00:51:37 +02: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
bar@mysql.com/bar.myoffice.izhnet.ru
4722743cae After merge fix for Bug N22645 2006-12-14 17:48:32 +04: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
bar@bar.intranet.mysql.r18.ru
f29b2bea7a Merge mysql.com:/usr/home/bar/mysql-5.0.b22645
into  mysql.com:/usr/home/bar/mysql-5.1.b22645
2006-12-14 16:45:48 +04: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