Commit graph

9510 commits

Author SHA1 Message Date
Sinisa@sinisa.nasamreza.org
566ebb63ce merge fixes 2003-08-27 14:36:38 +03:00
lenz@mysql.com
215935d611 - added missing file vio_priv.h to source distribution 2003-08-27 12:26:21 +02:00
monty@narttu.mysql.fi
fe9dc5e711 Add column names for metadata when running mysql with -T
Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324
2003-08-27 10:26:03 +03:00
monty@narttu.mysql.fi
165042204d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-27 02:52:27 +03:00
monty@narttu.mysql.fi
66b160c253 vio ssl structure renames (to get rid of ending _)
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
2003-08-27 02:51:39 +03:00
serg@serg.mylan
cb82f06dfb do not try to "analyze" or "sort index" in the table that has no indexes or no records if --check-only-changed option is used.
It's because such a table is never marked as "analyzed" or "sorted", so --check-only-changed doesn't work
2003-08-27 00:58:42 +02:00
serg@serg.mylan
1fb8c31e07 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-26 23:57:14 +02:00
serg@serg.mylan
f7f48719f8 fix ANALYZE TBALE to never generate rec_per_key_part < 1, as it prevent the table from being marked as analyzed (and the value is meaningless anyway) 2003-08-26 23:52:15 +02:00
bell@laptop.sanja.is.com.ua
8b8b984da0 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
2003-08-26 23:32:20 +03:00
Sinisa@sinisa.nasamreza.org
ff6bc0965b Fixed a very rarge memory overrun bug in the myisamlog program. 2003-08-26 22:02:58 +03:00
monty@narttu.mysql.fi
1d0b539263 Fix for bug in ROLLUP when all tables where 'const' tables (Bug #714) 2003-08-26 20:23:48 +03:00
monty@narttu.mysql.fi
7b99412988 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-08-26 17:53:42 +03:00
monty@narttu.mysql.fi
753cb8509c Cleanups
BTREE, HASH and RTREE are not reserved symbols anymore
2003-08-26 17:52:54 +03:00
bell@laptop.sanja.is.com.ua
48825fe40b after merge fix 2003-08-26 17:45:42 +03:00
bell@laptop.sanja.is.com.ua
eb3240a908 merge 2003-08-26 16:49:53 +03:00
bell@laptop.sanja.is.com.ua
7a86c7df28 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2003-08-26 16:42:49 +03:00
bell@laptop.sanja.is.com.ua
31657edc5f Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
2003-08-26 16:24:51 +03:00
lenz@mysql.com
fea30410ed - Reverted a fix for bug#897, as it broke the installation on some
other operating systems - some implementations of "hostname" simply set
   the host name to "-f" instead of giving an error about an unkown option
2003-08-26 14:29:13 +02:00
guilhem@mysql.com
2610303bc0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-25 16:33:20 +02:00
monty@narttu.mysql.fi
f5a134ba56 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-25 17:20:51 +03:00
guilhem@mysql.com
cc29458056 comments about mutexes in replication.
Don't start the SQL slave thread with SQL_BIG_SELECTS;
it's better to inhibate max_join_size instead.
2003-08-25 16:20:21 +02:00
monty@narttu.mysql.fi
2c1f1206c3 Better fix for myisamchk --sort-index on windows
Fixed deadlock bug when doing resize of key buffer while key buffer was in active use
2003-08-25 17:19:44 +03:00
Sinisa@sinisa.nasamreza.org
58c659a3bd symlink.result:
Fix for a small error in the merge from 4.0
2003-08-25 17:07:14 +03:00
bell@laptop.sanja.is.com.ua
5b28d4a9a4 removed --rpl option of ./mysql-test-run
(./mysql-test-run t/rpl*.test  do same work)
2003-08-25 16:40:14 +03:00
guilhem@mysql.com
73fe41f997 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-25 14:18:56 +02:00
guilhem@mysql.com
6c9cff9534 Clearer states in SHOW PROCESSLIST for replication threads.
For example the Binlog_dump thread (on the master) sometimes showed "Slave:".
And there were confusing messages where "binlog" was employed instead
of "relay log".
2003-08-25 14:13:58 +02:00
monty@narttu.mysql.fi
f83e876065 Update of VC++ project files (to remove link warnings)
Fix unlock error in myisamchk on windows when doing --sort-index
Use SetFilePointer instead of SetFilePointerEx
2003-08-25 14:27:32 +03:00
heikki@hundin.mysql.fi
ea5f464d20 os0file.c:
strerror() does not work in Windows
2003-08-24 03:44:16 +03:00
Sinisa@sinisa.nasamreza.org
4ba1506244 union.result:
same as above
sql_lex.h:
  same as above 
sql_union.cc:
  same as aobve
sql_select.cc:
  Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
  Plus updating some fields in THD in the proper places 
  plus fixing a wrong result
2003-08-23 21:21:02 +03:00
guilhem@mysql.com
cc918272ed The slave threads MUST not care about max_join_size, we start them with
OPTION_BIG_SELECTS.
2003-08-23 17:41:43 +02:00
guilhem@mysql.com
c3a18a3da4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-23 16:54:22 +02:00
guilhem@mysql.com
10811aba88 * Fix for a potential bug:
when the SQL thread stops, set rli->inside_transaction to 0. This is needed if the user
later restarts replication from a completely different place where there are only autocommit
statements.
* Detect the case where the master died while flushing the binlog cache to the binlog
and stop with error. Cannot add a testcase for this in 4.0 (I tested it manually)
as the slave always runs with --skip-innodb.
2003-08-23 16:53:04 +02:00
monty@narttu.mysql.fi
9d02d19ce8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-23 12:26:08 +03:00
monty@narttu.mysql.fi
e12136b468 show symlinked directories in SHOW CREATE TABLE 2003-08-23 12:25:39 +03:00
serg@serg.mylan
8424aec8db added support for --libs_r 2003-08-22 23:41:56 +02:00
serg@serg.mylan
eb3912c05a bug #1078. two innodb+delayed crashes 2003-08-22 18:21:23 +02:00
Sinisa@sinisa.nasamreza.org
ced195f8a9 After merge fixes 2003-08-22 18:43:46 +03:00
Sinisa@sinisa.nasamreza.org
4d2902a27d grant.result, grant.test, sql_acl.cc:
Fix for a bug #878
2003-08-22 18:32:11 +03:00
guilhem@mysql.com
9676fdcbcd Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-22 15:42:22 +02:00
guilhem@mysql.com
759a3c1e3c 2 minor edits, plus
fix for BUG#1113 "INSERT into non-trans table SELECT ; ROLLBACK" does not send warning"
and
fix for BUG#873 "In transaction, INSERT to non-trans table is written too early to binlog".
Now we don't always write the non-trans update immediately to the binlog;
if there is something in the binlog cache we write it to the binlog cache
(because the non-trans update could depend on a trans table which was modified
earlier in the transaction); then in case of ROLLBACK, we write the binlog
cache to the binlog, wrapped with BEGIN/ROLLBACK.
This guarantees that the slave does the same updates.
For ROLLBACK TO SAVEPOINT: when we execute a SAVEPOINT command we write it
to the binlog cache. At ROLLBACK TO SAVEPOINT, if some non-trans table was updated,
we write ROLLBACK TO SAVEPOINT to the binlog cache; when the transaction
terminates (COMMIT/ROLLBACK), the binlog cache will be flushed to the binlog
(because of the non-trans update) so we'll have SAVEPOINT and ROLLBACK TO
SAVEPOINT in the binlog.

Apart from this rare case of updates of mixed table types in transaction, the
usual way is still clear the binlog cache at ROLLBACK, or chop it at
ROLLBACK TO SAVEPOINT (meaning the SAVEPOINT command is also chopped, which
is fine).
Note that BUG#873 encompasses subbugs 1) and 2) of BUG#333 "3 binlogging bugs when doing INSERT with mixed InnoDB/MyISAM".
2003-08-22 15:39:24 +02:00
monty@narttu.mysql.fi
5192a58140 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-22 04:08:16 +03:00
monty@narttu.mysql.fi
efa85aad49 Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files. 2003-08-22 04:07:40 +03:00
serg@serg.mylan
e3a3d00c77 merged 2003-08-21 21:39:22 +02:00
serg@serg.mylan
7f1ffcc453 Bug #1064: SHOW CREATE TABLE: avoid allocations for simple tables, old client compatibility 2003-08-21 21:14:02 +02:00
serg@serg.mylan
828789a4a0 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mylan:/usr/home/serg/Abk/mysql
2003-08-21 20:21:36 +02:00
serg@serg.mylan
5bc4965d70 fix for SHOW CREATE TABLE to report corerct second field's length 2003-08-21 20:21:07 +02:00
serg@serg.mylan
aee1791280 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-21 20:15:42 +02:00
serg@serg.mylan
3d41d57765 crash BUG#1116 fixed 2003-08-21 20:13:26 +02:00
serg@serg.mylan
58bdc6f5e1 use crc32() from bundled zlib if system zlib is unavailable 2003-08-21 18:30:43 +02:00
serg@serg.mylan
08d7f298ee fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
moved them all from different places to item_strfunc.{h,cc}
checksum table command
Com_xxx status variables updated
2003-08-21 16:15:06 +02:00