Commit graph

7076 commits

Author SHA1 Message Date
guilhem@mysql.com
c238a9256a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-10-21 12:24:32 +02:00
guilhem@mysql.com
c93f69e9dd Fix for Bug #1595 "mysqlbinlog can't read a password from the console".
** I already fixed it in 3.23; I fix it in 4.0 separately because the
code is a bit different (so the changeset 1.1422 of 3.23 should not be
merged here) **
Make mysqlbinlog prompt for the password if
mysqlbinlog -p
instead of printing the usage().
This makes mysqlbinlog behave like other clients.
This new code was almost copied from mysqldump.
Note that before, one could use
  mysqlbinlog -p pass
and now one must use
  mysqlbinlog -ppass
(putting a space will ask for the password).
2003-10-21 12:22:24 +02:00
heikki@hundin.mysql.fi
e52a2f1ace os0file.c:
Check that writes to data files always happen in to addresses divisible by 16 kB, and the chunk size is also divisible by 16 kB; a user reported 2 corrupt pages from Linux-2.4.20 where an index page seemed displaced
2003-10-19 20:31:32 +03:00
heikki@hundin.mysql.fi
18995bb1c6 os0file.c:
Check that writes to data files always happen in to addresses divisible by 16 kB, and the chunk size is also divisible by 16 kB; a user reported 2 corrupt pages from Linux-2.4.20 where an index page seemed displaced
2003-10-19 20:28:03 +03:00
heikki@hundin.mysql.fi
91f5c5e337 thr0loc.c, srv0start.c, srv0srv.c, srv0srv.h, os0thread.h, ha_innodb.cc:
Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB
2003-10-17 23:44:34 +03:00
kostja@oak.local
4aedeb3a60 Merge oak.local:/home/kostja/mysql/mysql-4.0-root
into oak.local:/home/kostja/mysql/mysql-4.0-1274
2003-10-17 18:44:13 +04:00
guilhem@mysql.com
fad448bddd cancelling a previous change I made in rpl_trunc_binlog.test (which I did not push),
to enable SHOW SLAVE STATUS again.
2003-10-17 09:26:38 +02:00
guilhem@mysql.com
ecce9f23ae test update: what we want to detect in this test is if the slave stopped. 2003-10-17 09:15:30 +02:00
lenz@mysql.com
095db2746e - Updated rpl_trunc_binlog test result after last change 2003-10-17 02:32:09 +02:00
guilhem@mysql.com
ce6d736714 A fix for a random test failure rpl_trunc_binlog: don't RESET MASTER
while the slave is connected.
2003-10-17 00:00:25 +02:00
lenz@mysql.com
2cd7ef6a7b Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-10-16 22:18:04 +02:00
lenz@mysql.com
83f5c4dbf8 - fixed small typo to resolve "test: argument expected" error on Solaris
and Tru64 when running "mysql_install_db"
2003-10-16 22:15:36 +02:00
bell@sanja.is.com.ua
857b7a80a3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc_crash-4.0
2003-10-16 21:17:45 +03:00
monty@mashka.mysql.fi
b1dba93cdb Safety fix to detect multiple calls to my_thread_end()
Portability fix (For Mac OS X)
2003-10-16 20:55:15 +03:00
kostja@oak.local
c7d8977f43 fix for one of the bugs spotted by #1274 2003-10-16 17:00:09 +04:00
monty@mashka.mysql.fi
3414cf2e9f Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-10-16 08:23:43 +03:00
monty@mashka.mysql.fi
f2884bac40 Changing max_insert_delayed_threads now also changes the size of thread alarm buffer. 2003-10-16 07:44:18 +03:00
greg@mysql.com
9f7b30f5f8 Created small scripts to manage in-tree diffs for
NetWare platform, so changes are visible in the tree 
but cannot affect other platforms.
2003-10-15 19:50:47 -04:00
monty@mashka.mysql.fi
4d45ad98b9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-10-15 21:50:36 +03:00
monty@mashka.mysql.fi
84d9d98078 Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)
2003-10-15 21:41:13 +03:00
serg@serg.mylan
33e5f4edec dummy resize_thr_alarm for Netware 2003-10-15 17:10:47 +02:00
monty@mashka.mysql.fi
4897c6649d Updated comments 2003-10-15 16:55:24 +03:00
monty@mashka.mysql.fi
35c09b8082 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-10-15 16:23:01 +03:00
monty@mashka.mysql.fi
b5849f451d Add more information about memory usage to debug log 2003-10-15 15:21:50 +03:00
paul@teton.kitebird.com
da97e073d4 Identical mysql.ico and MYSQL.ICO
existed, causing problems on non-case-sensitive OSes.
Deleted conflicting file.
2003-10-14 10:45:03 -05:00
monty@mashka.mysql.fi
2d3840f550 Fixed bug in SET enum_system_variable=NULL 2003-10-14 16:30:42 +03:00
serg@serg.mylan
f078e50a6b make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and Select_priv is granted on the table level. 2003-10-14 13:10:41 +02:00
serg@serg.mylan
f3e7012d6e Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-10-14 00:27:04 +02:00
monty@mashka.mysql.fi
c95d142f8f Add new user variables for tuning memory usage:
query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization
2003-10-11 22:00:24 +03:00
vva@eagle.mysql.r18.ru
8e801a281e Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.0
2003-10-10 13:12:39 -04:00
guilhem@mysql.com
757b44de05 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-10-09 18:19:17 +02:00
guilhem@mysql.com
b2500829a3 Make the slave die if master is 5.0. Indeed, 5.0 masters send
a Format_description_log_event (or maybe it will be named
Description_log_event) which is not recognized by 4.0, so
a 4.0 can't be a slave of 5.0. We detect it early to produce
a helpful message instead of "corrupted relay log" later.
2003-10-09 17:40:38 +02:00
vva@eagle.mysql.r18.ru
6f96749cca fixed temp directory for mysqlbinlog (was wrong on solaris) 2003-10-08 17:15:59 -04:00
monty@mashka.mysql.fi
9bba878b8c Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-10-08 22:12:32 +03:00
lenz@mysql.com
75e74c79ec Merge 2003-10-08 12:49:42 +02:00
lenz@mysql.com
4bc3f12caf - added make_sharedlib_distribution.sh to the source distribution 2003-10-08 12:35:24 +02:00
monty@narttu.mysql.fi
d00d9110ba Fixed test case that my last patch to mysqlbinlog broke.
Changed --remote to --read-from-remote-server (mysqlbinlog)
2003-10-08 10:23:54 +03:00
monty@narttu.mysql.fi
02ad66f32e Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-10-08 01:30:31 +03:00
monty@narttu.mysql.fi
a278a77475 Fix for option 'R' (connect to remote server) in mysqlbinlog 2003-10-08 01:30:10 +03:00
serg@serg.mylan
9d198d35bf merged 2003-10-07 20:41:07 +02:00
guilhem@mysql.com
ed5d059202 Fix for a test failure with the standard (no-BDB) binary:
as the test is meaningful only if the slave supports transactions,
we require this. As in 4.0 the slave runs with --skip-innodb, we
test for BDB.
2003-10-07 20:41:06 +02:00
monty@narttu.mysql.fi
1b06af3a97 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-10-07 21:41:05 +03:00
vva@eagle.mysql.r18.ru
16b8fd8ece Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
2003-10-07 14:41:04 -04:00
monty@narttu.mysql.fi
b82b76f480 Simple cleanups 2003-10-07 15:44:31 +03:00
monty@narttu.mysql.fi
446d40e880 After merge fixes 2003-10-07 00:23:29 +03:00
monty@narttu.mysql.fi
fa823857d3 Merge with 3.23.58 2003-10-06 21:21:04 +03:00
serg@serg.mylan
511589a4f8 results updated 2003-10-06 20:11:39 +02:00
serg@serg.mylan
b58098c3b9 bug #1434 (and related issues) 2003-10-06 20:02:27 +02:00
monty@narttu.mysql.fi
0a241aa2ed Portability fix 2003-10-06 20:31:35 +03:00
serg@serg.mylan
2667d7f8cc fix_max_connections to resize alarm_queue (Bug #1435) 2003-10-06 14:11:16 +02:00