pem@mysql.comhem.se
3ed561d3cf
Post-merge fixes.
2003-12-01 18:24:09 +01:00
pem@mysql.com
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
Sinisa@sinisa.nasamreza.org
168e81d6b6
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-12-01 13:47:05 +02:00
monty@mysql.com
f266cdabab
Portability fixes (for binary build)
...
Added --protocol to mysqlbinlog
2003-12-01 13:13:16 +02:00
monty@mysql.com
3ee758497f
Mark position as # to make test portable
2003-11-28 21:05:53 +02:00
serg@serg.mylan
77d137a24a
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-28 18:18:58 +01:00
monty@mysql.com
5914033478
merge with 4.0 to get fix for range bug
2003-11-28 15:55:43 +02:00
monty@mysql.com
4f42a47408
Fixed range optimzier bug (Bug #1828 )
2003-11-28 15:45:34 +02:00
monty@mysql.com
8e613176b5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-28 14:47:33 +02:00
serg@serg.mylan
3b49d34f97
merged
2003-11-28 12:49:58 +01:00
serg@serg.mylan
16e5b4f0ba
bug #1945 . item(expression)->name=0, crash in find_item_in_list
2003-11-28 12:36:45 +01:00
monty@mysql.com
7f9466a717
Merge
2003-11-28 13:31:38 +02:00
monty@mysql.com
ede8169d24
Added missing SSL library (Should be in source distribution)
...
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02:00
sergefp@mysql.com
82270288de
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0
2003-11-28 00:34:52 +03:00
sergefp@mysql.com
ae15947360
Fix for bug 1974
2003-11-28 00:31:15 +03:00
bell@sanja.is.com.ua
bd0aef2df3
code coverage for UNIONs
2003-11-27 19:45:28 +02:00
pem@mysql.comhem.se
d8bf426b80
Fixed BUG#1965: Opening a cursor hangs client when malformed select fails
...
and BUG#1966: "select 1 into a" on top-level hangs client
2003-11-27 16:48:21 +01:00
guilhem@mysql.com
292b0a1892
Fix for BUG#1960 "date_format() returns spurious '-' for valid dates".
...
It was a forgotten ltime->neg=0 (neg was the only forgotten variable).
I scanned field.cc for other places where we would forget to set neg, found none.
A test for the bug.
2003-11-26 17:06:24 +01:00
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
