Commit graph

43067 commits

Author SHA1 Message Date
anozdrin/alik@alik.opbmk
fe585401ed Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-build
into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build
2007-02-23 21:55:14 +03:00
anozdrin/alik@alik.opbmk
90115eac42 Fix mysql-test-run.pl: IM in 5.0 uses old incorrect
'shutdown_delay' option name.
2007-02-23 21:51:33 +03:00
anozdrin/alik@alik.opbmk
a9e8d461e3 Fix result file. 2007-02-23 21:13:21 +03:00
anozdrin/alik@alik.opbmk
5444269805 Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-build
into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build
2007-02-23 20:53:49 +03:00
anozdrin/alik@alik.opbmk
0be4589311 Fix test for views with national characters,
which accidentally got broken during the merge
on 16-Feb-2007.
2007-02-23 20:49:01 +03:00
anozdrin/alik@alik.opbmk
13acde39ba Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt
into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt
2007-02-23 20:27:13 +03:00
anozdrin/alik@alik.opbmk
8f5c21172c BUG#24415: im_daemon_life_cycle.imtest fails
Fix timeouts. Only test suite is changed.
2007-02-23 20:24:32 +03:00
anozdrin/alik@alik.opbmk
100c19c01f Merge fix. 2007-02-22 22:56:43 +03:00
anozdrin/alik@alik.opbmk
8a7f5ce30d Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt
into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merge
2007-02-22 21:59:43 +03:00
anozdrin/alik@alik.opbmk
9abb43bf1b Fix powermacg5 build failure. 2007-02-22 20:56:33 +03:00
kostja@bodhi.local
54de3b990c Clean up one place that misuses LOCK_open (dead code) 2007-02-22 19:45:06 +03:00
Kristofer.Pettersson@naruto.
6c9fd8599d Merge naruto.:C:/cpp/bug25042/my50-bug25042
into  naruto.:C:/cpp/mysql-5.1-runtime
2007-02-21 14:01:05 +01:00
anozdrin/alik@alik.opbmk
76f813a52e Fix for BUG#24415: Instance manager test im_daemon_life_cycle fails randomly.
The cause of im_daemon_life_cycle.imtest random failures was the following
behaviour of some implementations of LINUX threads: let's suppose that a
process has several threads (in LINUX threads, there is a separate process for
each thread). When the main process gets killed, the parent receives SIGCHLD
before all threads (child processes) die. In other words, the parent receives
SIGCHLD, when its child is not completely dead.

In terms of IM, that means that IM-angel receives SIGCHLD when IM-main is not dead
and still holds some resources. After receiving SIGCHLD, IM-angel restarts
IM-main, but IM-main failed to initialize, because previous instance (copy) of
IM-main still holds server socket (TCP-port).

Another problem here was that IM-angel restarted IM-main only if it was killed
by signal. If it exited with error, IM-angel thought it's intended / graceful
shutdown and exited itself.

So, when the second instance of IM-main failed to initialize, IM-angel thought
it's intended shutdown and quit.

The fix is
  1. to change IM-angel so that it restarts IM-main if it exited with error code;
  2. to change IM-main so that it returns proper exit code in case of failure.
2007-02-20 22:31:50 +03:00
anozdrin/alik@alik.opbmk
61b624eb76 Polishing:
1. use MySQL headers instead of system ones;
  2. move logical part of code into a separate function.
2007-02-20 21:28:30 +03:00
anozdrin/alik@alik.opbmk
a91354c3be Fix Windows build. 2007-02-20 20:31:16 +03:00
anozdrin/alik@booka.
bfb2c3eb3d Fix build failures on Windows and Mac. 2007-02-20 12:28:24 +03:00
thek@kpdesk.mysql.com
9660ea640c Merge kpettersson@bk-internal:/home/bk/mysql-5.1-runtime
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime
2007-02-20 10:14:32 +01:00
thek@kpdesk.mysql.com
bfea428c5a Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my51-bug23240
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime
2007-02-19 16:13:13 +01:00
thek@kpdesk.mysql.com
84b96eb5e8 Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00' as the date time
- Merged from 5.0
- Removed redundant call to set_time(); now included in init_for_queries
2007-02-19 16:09:55 +01:00
thek@kpdesk.mysql.com
3c88372a1e Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-runtime
2007-02-19 15:24:01 +01:00
thek@kpdesk.mysql.com
58975264a9 Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240
into  kpdesk.mysql.com:/home/thek/dev/bug23240/my51-bug23240
2007-02-19 14:58:59 +01:00
thek@kpdesk.mysql.com
19dfc42eb6 Bug#23240 --init_file statements with NOW() reports '1970-01-01 11:00:00'as the date time
- Starting time of a query sent by bootstrapping wasn't initialized
  and starting time defaulted to 0. This later used value by NOW-
  item and was translated to 1970-01-01 11:00:00.
- Marketing the time with thd->set_time() before the call to
  mysql_parse resolves this issue.
- set_time was refactored to be part of the thd->init_for_queries-
  process.
2007-02-19 14:57:54 +01:00
kostja@bodhi.local
99354e557c Fix a merge error (4.1->5.0 merge from 2005) 2007-02-19 15:48:00 +03:00
thek@kpdesk.mysql.com
d6062a51e5 Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my41-bug23240
into  kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240
2007-02-19 10:08:27 +01:00
thek@kpdesk.mysql.com
dd41fd5732 Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as the date time
- Starting time of a query sent by file bootstrapping wasn't initialized
  and starting time defaulted to 0. This later used value by the Now-
  item and is translated to 1970-01-01 11:00:00.
- marking the time with thd->set_time() before the call to 
  mysql_parse resolves this issue.
2007-02-19 09:37:34 +01:00
anozdrin/alik@alik.opbmk
f97d10d236 Patch for IM in scope of working on BUG#24415: Instance manager test
im_daemon_life_cycle fails randomly.

1. Move IM-angel functionality into a separate file, create Angel class.
2. Be more verbose;
3. Fix typo in FLUSH INSTANCES implementation;
4. Polishing.
2007-02-18 15:45:28 +03:00
malff/marcsql@weblab.(none)
0bf1b708f3 Manual merge 2007-02-16 13:42:52 -07:00
malff/marcsql@weblab.(none)
f8839a70bd Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-02-16 09:02:02 -07:00
malff/marcsql@weblab.(none)
3febb266e7 Manual merge 2007-02-15 18:47:39 -07:00
malff/marcsql@weblab.(none)
5c8216ba83 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-02-15 14:04:03 -07:00
Kristofer.Pettersson@naruto.
cd0a43f528 Bug#25042 OPTIMIZE TABLE cause race condition in IO CACHE SHARE
- The condition variable implementation "lost" a signal to
  WaitOnSingleObject when a semaphore was released.
- The signal could be consumed by a new call to pthread_cond_wait
  before all waiting threads had awoken.
- The new implementation of pthread_cond_* uses events
  instead of semaphores. It also uses an extra lock to protect entry
  into new cond wait before the broadcast has finished.
2007-02-15 14:08:21 +01:00
cmiller@zippy.cornsilk.net
757267b140 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-02-14 10:48:30 -05:00
cmiller@zippy.cornsilk.net
154f7f396e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-02-14 10:47:39 -05:00
igor@olga.mysql.com
d36e264cc5 Post-merge fix 2007-02-13 19:59:46 -08:00
igor@olga.mysql.com
a68e2d0172 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/mysql-5.1-opt
2007-02-13 16:09:38 -08:00
igor@olga.mysql.com
452c134d3f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  olga.mysql.com:/home/igor/mysql-5.1-opt
2007-02-13 16:08:01 -08:00
ibabaev@bk-internal.mysql.com
0df74eae05 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-02-14 00:58:54 +01:00
igor@olga.mysql.com
c84ee7079c Post-merge fix 2007-02-13 15:49:42 -08:00
cmiller@zippy.cornsilk.net
4862fbd593 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-02-13 18:01:24 -05:00
ibabaev@bk-internal.mysql.com
266300142e Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-02-13 23:35:06 +01:00
cmiller@zippy.cornsilk.net
2f1b34a581 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my50-bug25807
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my51-bug25807
2007-02-13 17:21:50 -05:00
cmiller@zippy.cornsilk.net
9e9dd4327c Bug#25807: LOAD DATA INFILE does not work with Pipes
Showstopper and regression against 5.0.24.

Previously, we ignored seek() errors (see Bug#22828) and let seek()s
against pipes fail.  Now, since we check that a seek didn't fail,
and return without reading, this bug popped up.

This restores the behavior for file-ish objects that could never be 
seek()ed.
2007-02-13 16:35:29 -05:00
igor@olga.mysql.com
a196ccafe6 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/mysql-5.1-opt
2007-02-13 13:31:23 -08:00
igor@olga.mysql.com
273d016aad Post-merge fix. 2007-02-13 13:15:23 -08:00
cmiller@zippy.cornsilk.net
ae27eeea58 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/tmpmerge
2007-02-13 10:50:44 -05:00
df@kahlann.erinye.com
b22c89d36b .del-README.txt-renamed:
Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed
2007-02-13 16:31:24 +01:00
cmiller@zippy.cornsilk.net
094277c1bf Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-02-13 10:23:32 -05:00
cmiller@zippy.cornsilk.net
6473de8db1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-02-13 10:02:00 -05:00
igor@olga.mysql.com
fb9e0ad3be Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/mysql-5.1-opt
2007-02-13 01:34:36 -08:00
msvensson@pilot.mysql.com
b74a067246 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-13 10:27:39 +01:00