monty@mysql.com
f074511529
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-24 09:46:11 +02:00
bell@sanja.is.com.ua
675186d816
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-11-23 21:27:48 +02:00
bell@sanja.is.com.ua
afe48d3ce4
after review fixes
2003-11-23 21:26:43 +02:00
guilhem@mysql.com
fd82946b3c
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-11-23 17:05:03 +01:00
guilhem@gbichot2
05e5a35bf2
Replication:
...
Now the I/O thread (in flush_master_info()) flushes the relay log to disk
after reading every event. Slower but provides additionnal safety in case
of brutal crash.
I had to make the flush optional (i.e. add a if(some_bool_argument) in the function)
because sometimes flush_master_info() is called when there is no usable
relay log (the relay log's IO_CACHE is not initialized so can't be flushed).
2003-11-23 17:02:59 +01:00
bell@sanja.is.com.ua
9fbf629cdc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-11-23 17:59:28 +02:00
monty@mysql.com
73fe3812e4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-23 15:35:43 +02:00
monty@mysql.com
05f1e10030
merge with 4.0
2003-11-23 14:52:02 +02:00
monty@mysql.com
7c725b2486
Fixed compiler warnings from Intel compiler in Win64
...
Added option --max-record-length=# to myisamchk
Don't try repair twice if doing myisamchk --repair --force
Shared memory handler didn't clean up things on errors or shutdown
2003-11-23 14:36:41 +02:00
bell@sanja.is.com.ua
7191ea0ae3
Fixed UNION fields type/length detecting
2003-11-23 02:01:15 +02:00
dlenev@mysql.com
baa6ee20b2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg1500-2
2003-11-23 00:48:59 +03:00
dlenev@dlenev.mshome
625371f306
Fix for bug #1500 "Server crash with mysql_prepare"
...
We treat Item_param whose value is not set as non-const.
This allows us to avoid use of Item_param's value (not yet existing) in
those fix_fields and fix_length_and_dec that do calculations if their
Items arguments are const. So we can call fix_fields for such items from
mysql_prepare safely.
2003-11-23 00:48:18 +03:00
paul@teton.kitebird.com
9b4050c406
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2003-11-21 23:02:06 -06:00
monty@mysql.com
c2e44ba772
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-22 04:01:08 +02:00
monty@mysql.com
d87494c5ac
Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
...
Updated project files for windows
Made rpl_change_master.test portable
Ensure that mutex are not freed if not initilized
2003-11-22 03:21:40 +02:00
paul@teton.kitebird.com
7a1bb450a6
Change word order of a few PROCESSLIST messages to correspond
...
to order used in START SLAVE syntax.
2003-11-21 12:35:33 -06:00
konstantin@mysql.com
4883d21b29
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-11-21 19:17:02 +03:00
konstantin@oak.local
47812674a5
added 'explicit' keyword to Bitmap constructor
2003-11-21 19:16:19 +03:00
heikki@hundin.mysql.fi
f8e9f31e93
os0file.c:
...
Fix the OS error 2 reported by Miguel and Mark in Windows crash recovery: a * had been forgotten from the path in directory scanning
ha_innodb.cc:
Set default directory in fil0fil.c right if we are running the Embedded Server Library, where the default dir of the process is not necessarily the MySQL datadir
2003-11-21 17:01:35 +02:00
monty@mysql.com
d08945498e
Fixed memory leak with RAID tables
...
Fixed tests for RAID tables
Detect uninitialized mutexes on lock and destroy
2003-11-21 14:41:57 +02:00
monty@mysql.com
19b5da3247
Added missing file keycache.h
2003-11-21 12:22:51 +02:00
hf@deer.(none)
eb08458c55
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.1727
2003-11-21 11:58:28 +04:00
paul@ice.snake.net
0a5af44480
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Users/paul/mysql-4.1
2003-11-20 21:16:45 -06:00
monty@mysql.com
8aeb63dd3b
Update VC++ files
...
Portability fixes
After merge fixes
2003-11-21 01:53:01 +02:00
serg@serg.mylan
5443cba38e
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-20 23:25:59 +01:00
monty@mysql.com
32a62d5069
Merge with 4.0 to revert patch for BIGINT assignment to double
2003-11-21 00:17:46 +02:00
serg@serg.mylan
8ca1836207
yet another trunc* bug
2003-11-20 23:15:07 +01:00
monty@mysql.com
41eda1c949
Revert patch for bigint handling in double context as it broke normal bigint handling
...
The right way to fix this is to change the Field::store(longlong) method to be
Field::store(longlong, bool unsigned_flag), but this is better to do in 4.1 than in 4.0
2003-11-21 00:11:50 +02:00
serg@serg.mylan
cb235f43c9
Merge
2003-11-20 23:07:31 +01:00
serg@sergbook.mylan
55182340ba
more left join tests
2003-11-20 22:20:54 +01:00
monty@mysql.com
b01fcb4e14
Merge with 4.0 to get:
...
Fix for storing negative values in decimal fields
Fix for FLUSH TABLE with HANDLER
2003-11-20 22:30:48 +02:00
monty@mysql.com
55e07608fd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-20 22:07:02 +02:00
monty@mysql.com
7c6113a39f
Merge key cache structures to one
...
Fixed compiler warnings (IRIX C compiler and VC++)
2003-11-20 22:06:25 +02:00
paul@ice.snake.net
9cf6cf8370
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Users/paul/mysql-4.1
2003-11-20 14:03:45 -06:00
paul@ice.snake.net
4909a37eac
Use same style for SHOW MASTER STATUS fields as
...
for SHOW SLAVE STATUS.
2003-11-20 13:49:05 -06:00
paul@ice.snake.net
53c93091f2
Write slave status field names using consistent style.
...
(Initial caps for each word.) For example, instead of writing
Until_condition, Until_Log_File, and Until_log_pos, write
Until_Condition, Until_Log_File, and Until_Log_pos.
2003-11-20 13:07:25 -06:00
paul@ice.snake.net
ee46b6909c
Typo.
2003-11-20 12:55:07 -06:00
konstantin@mysql.com
dd287a4cdf
added comments to simple_order, simple_group, no_order, skip_sort_order
2003-11-20 21:21:56 +03:00
jani@ua167d18.elisa.omakaista.fi
0b1bae4677
Added error reporting if one of the multi queries failed.
2003-11-20 20:06:51 +02:00
bell@sanja.is.com.ua
da73d77f6f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-11-20 14:42:40 +02:00
jani@rhols221.adsl.netsonic.fi
cc2916c459
Added multi command support for mysql client.
2003-11-20 14:33:07 +02:00
bell@sanja.is.com.ua
1c38b23f96
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-11-20 14:31:47 +02:00
bell@sanja.is.com.ua
1d84fa4d4e
fixed memory allocation
2003-11-20 14:31:10 +02:00
monty@mashka.mysql.fi
ba659679e7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-11-20 03:12:17 +02:00
monty@mashka.mysql.fi
f382adcfca
Portability fixes (AIX43)
...
Add missing file to VC++ project
2003-11-20 03:11:33 +02:00
monty@mashka.mysql.fi
ac76198330
Portability fixes for AIX43
2003-11-20 02:48:09 +02:00
guilhem@mysql.com
a684227c4a
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-11-19 23:40:59 +01:00
guilhem@gbichot2
4bd3b096a0
Official builds are tested with mysql-test-run --sleep=10, and the slave
...
has (in mysql-test-run) a slave-net-timeout=10. So the 'sleep 1' below
was converted in 'sleep 10', so slave thought that connection was down,
so reconnected, so got an additional (fake) Rotate event, which shifted
the positions displayed by SHOW SLAVE STATUS.
2003-11-19 23:39:08 +01:00
serg@serg.mylan
707e7e8992
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-19 23:13:48 +01:00
serg@serg.mylan
0c2107c6b4
minor fixups: more verbose on "no memory" errors - report requested size, avoid flushing rec buffer to a file that is closed and deleted already (on got_error=1)
2003-11-19 23:07:31 +01:00