mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39353 commits 2785 branches 343 tags 1.6 GiB
Commit graph

518 commits

Author SHA1 Message Date
anozdrin/alik@alik.
18fb4abff4 Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-11-03 14:00:35 +03:00
monty@mysql.com/nosik.monty.fi
ca99516cc7 Fixed a lot of compiler warnings (Mainly in mysqld and instance manager) 
Fixed some possible fatal wrong arguments to printf() style functions
Initialized some not initialized variables
Fixed bug in stored procedure and continue handlers
(Fixes Bug#22150)
 2006-11-01 19:41:09 +02:00
kostja@bodhi.local
2fecf79536 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-10-23 12:35:56 +04:00
kostja@bodhi.local
b262a6a4b8 Merge bodhi.local:/opt/local/work/mysql-5.0-root 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-10-09 18:04:09 -07:00
anozdrin/alik@alik.
d238bd6755 Patch for BUG#15934: im_daemon_life_cycle fails sporadically. 
The problem was a race condition in a test case.

The fix eliminates the race condition by explicit
wait on UNIX socket to start accepting connections.

The patch affects only test suite (i.e. does not touch
server codebase).
 2006-10-03 18:42:59 +04:00
msvensson@neptunus.(none)
4f46f3bde7 Merge bk-internal:/home/bk/mysql-5.0-runtime 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-03 14:26:11 +02:00
msvensson@neptunus.(none)
48d99634f3 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-03 13:27:48 +02:00
dlenev@mockturtle.local
a4ee7ec153 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
 2006-09-29 10:55:03 +04:00
anozdrin/alik@alik.
2c73dbfaac Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-09-28 15:10:18 +04:00
msvensson@neptunus.(none)
d0bdc01ae3 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
 2006-09-28 09:33:09 +02:00
msvensson@neptunus.(none)
3eb44cb137 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-28 09:32:49 +02:00
msvensson@neptunus.(none)
712a937e30 Increase test suite timeout to 3 hours 2006-09-28 09:30:24 +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)
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
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)
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)
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
cmiller@zippy.cornsilk.net
161fea4ac4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-23 09:51:20 -04:00
cmiller@zippy.cornsilk.net
987b1b59e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-23 09:48:43 -04:00
georg@lmy002.wdf.sap.corp
67a701003c Fix for bug #19121: Windows incompatible udf_example 2006-09-22 14:42:43 +02:00
georg@lmy002.wdf.sap.corp
f4af1d8283 Windows 64bit fixes 
Fixed udf_example, so tests now can also run udf on win.
 2006-09-21 15:19:20 +02:00
msvensson@shellback.(none)
c74ebcc176 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-20 18:02:42 +02:00
msvensson@shellback.(none)
7029074c24 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-20 18:02:11 +02:00
msvensson@shellback.(none)
0c429abd29 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-20 15:45:42 +02:00
msvensson@shellback.(none)
339cd91a98 Fix problem with testcase timeouts not working. The timeout value was always multiplied with 10 
since the $opt_valgrind variable was initialised to 0, thus being "defined"
 2006-09-20 15:41:46 +02:00
msvensson@neptunus.(none)
f4c0e4efac Fix check of parameter type in mysqld_start. 2006-09-20 07:43:03 +02:00
msvensson@shellback.(none)
30e3cce970 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 20:01:40 +02:00
msvensson@shellback.(none)
9cb40c6e91 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 20:00:01 +02:00
msvensson@shellback.(none)
be1187e171 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-19 19:58:51 +02:00
msvensson@shellback.(none)
5a912955d5 Increase suite timeout even more - 6 times - when running with valgrind 2006-09-19 19:41:41 +02:00
msvensson@shellback.(none)
d3d7c74954 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 19:11:41 +02:00
msvensson@shellback.(none)
bd6fc1ce66 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 19:10:31 +02:00
msvensson@shellback.(none)
d8870f2bb3 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-19 18:41:48 +02:00
msvensson@shellback.(none)
883a3809c9 Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on 2006-09-19 18:39:04 +02:00
msvensson@shellback.(none)
ee5ca6e231 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 17:47:53 +02:00
msvensson@shellback.(none)
1b3094187a Fix warnings in mysql-test-run.pl 2006-09-19 17:45:27 +02:00
msvensson@shellback.(none)
1515818276 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 17:40:49 +02:00
msvensson@shellback.(none)
0e7d18d8e4 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-19 17:08:07 +02:00
msvensson@shellback.(none)
fa26e83fd2 Fix warnings in mysql-test-run.pl 2006-09-19 16:43:42 +02:00
msvensson@shellback.(none)
db1adb2234 Fix merge error, path_mysock has been renamed to path_sock 2006-09-18 19:38:59 +02:00
msvensson@shellback.(none)
7dabd8c683 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-18 18:06:10 +02:00
msvensson@shellback.(none)
8244e4fb73 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-18 18:04:47 +02:00
msvensson@shellback.(none)
781aaaba66 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-18 17:47:26 +02:00
msvensson@shellback.(none)
dafb50055f Add character-sets-dir argument to "mysql". That avoids a local 
installed charset dir being used.
 2006-09-18 17:46:36 +02:00
msvensson@shellback.(none)
16c07bd02c No need to use environment variable NDB_STATUS_OK and NDB_SLAVE_STATUS_OK anymore 
when mysql-test-run.pl has full control of all ndb processes. It will now know if
install has failed.
 2006-09-18 12:45:04 +02:00
msvensson@shellback.(none)
60b395a950 Remove extra semicolon 2006-09-18 12:24:10 +02:00
msvensson@shellback.(none)
f415523c17 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-18 11:34:07 +02:00