mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38391 commits 2781 branches 343 tags 1.6 GiB
Commit graph

38391 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
ca0b8c552a Fix compile failure on Sun C++ 5.7 in yaSSL code 
- Trying to use unctions declared as static being used from another file, change them to be inline
 2006-09-27 16:45:44 +02:00
petr/cps@mysql.com/owlet.local
6cb96bb8b4 Remove unused error messages (no release contains them 
at the moment, so we can safely do that). Update an error
mesage to make it translateable.
 2006-09-27 17:48:00 +04:00
msvensson@neptunus.(none)
9f7b589dd7 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-27 14:46:17 +02:00
msvensson@neptunus.(none)
312b4de035 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-27 14:44:06 +02:00
msvensson@neptunus.(none)
7f209e3152 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-27 14:41:29 +02:00
msvensson@neptunus.(none)
980268df03 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2006-09-27 14:38:25 +02:00
msvensson@neptunus.(none)
e4676ef60a Import yaSSL version 1.4.3 2006-09-27 14:36:12 +02:00
msvensson@neptunus.(none)
dc1ec664ce Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
 2006-09-27 13:56:32 +02:00
msvensson@neptunus.(none)
be9a5571f4 When valgrinding add /usr/lib/debug" to LD_LIBRARY_PATH if available 2006-09-27 13:42:16 +02:00
kroki/tomash@moonlight.intranet
a53e628181 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21414
 2006-09-27 12:22:16 +04:00
msvensson@neptunus.(none)
35ca84b31d Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-26 17:53:01 +02:00
msvensson@neptunus.(none)
8b2c05de32 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
 2006-09-26 17:52:50 +02:00
msvensson@neptunus.(none)
43f67cc4de Fir problem with winepath in mwenv 2006-09-26 17:52:15 +02:00
msvensson@neptunus.(none)
cc4d1a4d4d Merge neptunus.(none):/home/msvensson/mysql/netware/my51-netware 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-26 16:32:34 +02:00
msvensson@neptunus.(none)
03ead53d56 Merge neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-26 16:30:50 +02:00
msvensson@neptunus.(none)
f84b9577e2 Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-26 16:29:36 +02:00
msvensson@neptunus.(none)
a29a522815 Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware 
into  neptunus.(none):/home/msvensson/mysql/netware/my51-netware
 2006-09-26 16:28:28 +02:00
msvensson@neptunus.(none)
6a6345ef99 Hardcode the fact that we are using zlib 1.2.3(previously done via symlink zlib-1.1.4) 2006-09-26 16:25:01 +02:00
jani@a88-112-41-254.elisa-laajakaista.fi
5e2f69d1dd Added more tests of field conversions. 2006-09-26 17:20:14 +03:00
msvensson@neptunus.(none)
5481659f6e Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-26 16:05:11 +02:00
msvensson@neptunus.(none)
85cdcc8ea4 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-26 16:04:16 +02:00
msvensson@neptunus.(none)
422674c73f Update patch that restores slave databases from snapshots before start for 5.1 2006-09-26 16:01:16 +02:00
msvensson@neptunus.(none)
a09487b8ca Merge bk-internal:/home/bk/mysql-5.1-runtime 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-runtime
 2006-09-26 15:56:22 +02:00
msvensson@neptunus.(none)
14b02f75aa Merge neptunus.(none):/home/msvensson/mysql/bug18969/my50-bug18969 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-26 15:07:00 +02:00
msvensson@neptunus.(none)
ea91c010de Merge neptunus.(none):/home/msvensson/mysql/bug18969/my50-bug18969 
into  neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969
 2006-09-26 14:40:03 +02:00
msvensson@neptunus.(none)
dc02f761e5 Bug#18969 race condition involving slave and mysqltest. was rpl_insert_id test case fails 
- As the slaves are restarted for each testcase, take the opportunity to restore their databases to a known state with the help of the snapshot(s)
 - Count max number of slaves used in testcases
 - Use copy_install_db to speed up "Installing db" phase
 2006-09-26 13:49:42 +02:00
jani@a88-112-41-254.elisa-laajakaista.fi
4bfe83d5d1 Fix for bug#20208 
A better fix for bug#10025.

Fixed test case plus added new tests.

After fixing Bug#20208 "Blobs greater than 8K are being truncated to 8K"
the fix to bug#10025 "Misleading error with COLLATE mediumtext and UNION"
became more accurate. Earlier mediumtext got converted to longtext,
although mediumtext was enough to contain the results. Now it converts
correctly to mediumtext, if the length does not exceed that and if none
of the original fields were type longtext.

Type longtext still converts correctly to type longtext, as the extra
tests prove.
 2006-09-26 13:19:25 +03:00
msvensson@neptunus.(none)
4ee6e94fde Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-25 20:45:27 +02:00
msvensson@neptunus.(none)
0be1bf6eac Return from function 'collect_one_test_case' as sson it's detected that testcase should be skipped 2006-09-25 20:28:40 +02:00
msvensson@neptunus.(none)
06ae3e0e5f Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-25 20:25:13 +02:00
msvensson@neptunus.(none)
40a655b1b8 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-25 20:18:01 +02:00
msvensson@neptunus.(none)
e12092627e Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-09-25 20:15:51 +02:00
msvensson@neptunus.(none)
53b3faf783 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-09-25 20:03:22 +02:00
msvensson@neptunus.(none)
5edd58b14c Bug#18888 Trying to overwrite sql/lex_hash.h during build 
-Backport fix for bug19738 to 4.1
 2006-09-25 20:01:39 +02:00
andrey@example.com
f7a779acfb Fix for bug#22662 Inconsistent values displayed for event_scheduler 
when set to DISABLED
  
It was a silly ordering number error.
 2006-09-25 17:22:23 +02:00
andrey@example.com
db3a25fd78 Fix for bug#22397 Events: crash with procedure which alters events 
ALTER EVENT in stored procedure body led to a crash during the
procedure call. Affected was only ALTER EVENT which changed the
interval of the event. No problems with AT, STARTS, ENDS and so on.
 2006-09-25 16:49:25 +02:00
msvensson@neptunus.(none)
bcdecd96b7 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2006-09-25 16:46:37 +02:00
msvensson@neptunus.(none)
64a64d0fbf Import yaSSL version 1.4.0 2006-09-25 16:40:29 +02:00
andrey@example.com
d993720268 cleanups - fix a test and remove unneeded declaration 2006-09-25 15:50:49 +02:00
kaa@polly.local
1027446d12 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-25 13:30:19 +04:00
kaa@polly.local
059b026dc1 Merge polly.local:/tmp/22129/bug22129/my51-bug22129 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-25 13:23:33 +04:00
kaa@polly.local
cd14458467 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
 2006-09-25 13:07:41 +04:00
kaa@polly.local
8c625a3987 Merge polly.local:/tmp/22129/bug22129/my50-bug22129 
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
 2006-09-25 13:04:46 +04:00
kaa@polly.local
c7c9cdf2d1 Merge polly.local:/tmp/22129/bug22129/my50-bug22129 
into  polly.local:/tmp/22129/bug22129/my51-bug22129
 2006-09-25 12:52:01 +04:00
kaa@polly.local
781879adf9 Fixed broken 'strict' test which relied on incorrect behaviour of my_strtod() (fixed in bug #22129) 2006-09-25 12:50:32 +04:00
msvensson@neptunus.(none)
18f04d48a4 Merge neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my50-bug22379_runtime 
into  neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my51-bug22379_runtime
 2006-09-25 09:34:34 +02:00
jani@a88-112-41-254.elisa-laajakaista.fi
98e224eb12 Fixed a test result. Value of MAX_BLOB_WIDTH changed. 2006-09-25 10:30:23 +03:00
msvensson@neptunus.(none)
d2ebe6be03 Bug #22379 im_daemon_life_cycle.test fails on merge of 5.1 -> 5.1-engines 
Remove race situations that occur when removing pidfiles. Primarily each process should remove its own
pidfile, secondly it should be removed by the process that created it and _only_ if it's
certain the process is dead. Third, mysql-test-run.pl will remove the pidfile when process has been killed.
- Set state of an instance to STARTING _before_ calling instance->start()
- Check that pidfile of instance has been created before changing STARTING => STARTED
- Only remove the pidfile if IM kills an instance with SIGKILL, otherwise the instance will remove it itself
 2006-09-25 09:28:52 +02:00
jani/jamppa@production.mysql.com
201b810cf4 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208
 2006-09-25 08:10:58 +02:00
kent@c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
3a65bd1616 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1
 2006-09-25 01:36:14 +02:00