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
lenz@mysql.com
12fb40460b
- Rephrased two option help texts to not start with "use the ..." as this
...
confuses RPM's Perl module dependency checking (it adds a bogus
requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)
2003-11-24 17:05:24 +01:00
lenz@mysql.com
68690b0380
Merge mysql.com:/space/my/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0-build
2003-11-24 16:02:18 +01:00
serg@serg.mylan
19845c6b1f
WL#1172 optimization reverted
...
(see fulltext.test)
2003-11-24 14:49:03 +01:00
monty@mysql.com
c254bef18e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-24 15:04:50 +02:00
jani@rhols221.adsl.netsonic.fi
6c1c262dc1
Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG
...
did not call get_one_option().
2003-11-24 13:25:23 +02:00
jani@rhols221.adsl.netsonic.fi
b137384a38
Fixed Bug#1907, option of type GET_BOOL with arg type OPT_ARG
...
did not call get_one_option().
2003-11-24 13:25:08 +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@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
konstantin@mysql.com
09f2d912dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kostja/mysql/mysql-5.0-root
2003-11-23 17:35:19 +03:00
konstantin@oak.local
9c3632fb83
Cleanups:
...
- unused variable THD::con_root removed
- we don't need to bzero(&warn_root) just before init_alloc_root(&warn_root)
- we don't need to bzero(&transaction.mem_root) because we
bzero(&transaction) later in THD::THD
- we don't need to free thd->mem_root thd->transaction.mem_root
in handle_one_connection because they are freed in THD::~THD
which is called in end_thread later
2003-11-23 17:34:36 +03: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
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
sergefp@mysql.com
4f721196f3
Post-merge fixes
2003-11-22 00:20:48 +03: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
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
pem@mysql.com
e85a82060a
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2003-11-21 18:27:21 +01:00
pem@mysql.comhem.se
d9b8a35eeb
Translated 5.0 error codes into sql states.
2003-11-21 18:23:05 +01: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
konstantin@mysql.com
0abebc7dd0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kostja/mysql/mysql-5.0-root
2003-11-21 17:23:24 +03:00
konstantin@oak.local
d7fe94c798
unused variable handler_items removed
2003-11-21 17:22:54 +03:00
pem@mysql.comhem.se
86039a34e5
Made Item_splocal printable.
2003-11-21 14:00:40 +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
lenz@mysql.com
35af929935
- removed dependency on MySQL-client from the MySQL-devel RPM subpackage
...
as it is not really required. (BUG 1610) Thanks to Scott Harrison for
the suggestion.
2003-11-21 13:22:49 +01: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