bell@sanja.is.com.ua
2fb65b4def
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-25 23:56:54 +02:00
bell@sanja.is.com.ua
5474ada47a
added collation processing in UNION merging
...
temporary table BLOB now is longblob
2003-11-25 23:52:10 +02:00
serg@serg.mylan
34fdd54e07
post-merge fixes
2003-11-25 20:06:41 +01:00
serg@serg.mylan
bff0bbeb1f
merged
2003-11-25 18:26:53 +01:00
serg@serg.mylan
e267163612
mysql-test-run fixes:
...
libexec support in install_test_db
--start-from in mysql-test-run
2003-11-25 14:43:15 +01:00
sergefp@mysql.com
3d32afd736
Post-merge fixes for index_merge/Unique/5.0
2003-11-24 20:54:57 +03:00
pem@mysql.com
56ec2351a0
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2003-11-24 18:26:52 +01:00
pem@mysql.comhem.se
47f9c2946f
Changed "query" into "statement", and corrected SQL state code (04000->0A000).
2003-11-24 18:24:14 +01:00
Sinisa@sinisa.nasamreza.org
94a298466c
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-11-24 15:49:35 +02:00
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
monty@mysql.com
5dca5c7d53
Fix test for binary builds
2003-11-23 21:03:10 +02: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
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
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
sergefp@mysql.com
c8bc4edc7f
Merge mysql.com:/home/psergey/mysql-5.0
...
into mysql.com:/home/psergey/10-get-mysql5
2003-11-22 00:26:43 +03:00
bell@sanja.is.com.ua
09cefdd542
limit initialization moved to method of SELECT_LEX_UNIT (WL#695)
...
(SCRUM)
counters was not moved to SELECT_LEX because it used in methods inherited from select_result which should be applied to whole union results
2003-11-21 21:19:56 +02:00
bell@sanja.is.com.ua
6f73baf126
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2003-11-21 20:53:12 +02:00
bell@sanja.is.com.ua
e3e4836f30
warning number changed
2003-11-21 20:52:18 +02:00
pem@mysql.comhem.se
d9b8a35eeb
Translated 5.0 error codes into sql states.
2003-11-21 18:23:05 +01: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
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
sergefp@mysql.com
30b3c3bf1b
Merged, most likely needs post-merge fix
2003-11-21 00:27:54 +03:00
serg@sergbook.mylan
55182340ba
more left join tests
2003-11-20 22:20:54 +01:00
konstantin@mysql.com
c4a9dc4f8b
fix for bug #1790 :
...
"BIT_AND() result in GROUP BY different when SQL_BIG_RESULT used"
return value of BIT_AND changed to BIGINT SIGNED
Also the patch fixes another bug: when temporary table is in use and one of
values in group is NULL, BIT_AND always returns zero.
Fixed it to always skip null values.
2003-11-21 00:03:04 +03: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
sergefp@mysql.com
4016048d81
logging_ok:
...
Logging to logging@openlogging.org accepted
sql_union.cc, sql_select.cc, opt_range.h, opt_range.cc, opt_ft.h:
Post-merge fixes
Many files:
new file
2003-11-20 23:27:11 +03: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
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
pem@mysql.comhem.se
5e46a05960
Fixed BUG#1874: Don't call fix_fields() indiscriminately, it resets null_value
...
for some items, which made aggregates like MIN(), MAX() and SUM() fail.
2003-11-20 18:30:02 +01:00
bell@sanja.is.com.ua
a1ceb1bd04
database invalidation invalidate queries only of given database (BUG#1898)
2003-11-20 18:12:49 +02:00
pem@mysql.comhem.se
05f25feaa9
Handle null values correctly in SP local variables.
2003-11-20 16:14:24 +01:00
pem@mysql.comhem.se
96f1252899
Bugfixes in SHOW CREATE PROCEDURE/FUNCTION and SHOW PROCEDURE/FUNCTION STATUS;
...
- dropped routines should not show up in status
- error handling for non-existing routines
+ some cleanup.
2003-11-20 15:07:22 +01: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
pem@mysql.comhem.se
5b355ea6f5
Post-merge fixes.
2003-11-19 16:59:35 +01:00