Commit graph

6925 commits

Author SHA1 Message Date
unknown
db03c7e89f Fixed bug in the optimiser for FULL TABLE SCAN case:
to estimate correctly cost of full table scan we should take into
account rows read and skipped on each iteration.


mysql-test/r/distinct.result:
  Fixed test suite: now full scan is used
  less often
mysql-test/r/join_outer.result:
  Fixed test suite: now full scan is used
  less often
mysql-test/r/select_safe.result:
  Fixed test suite: now full scan is used
  less often
2003-09-15 22:21:39 +04:00
unknown
cdbc2fe43a Regenerated expired CA certificate and signed dependant certificates
SSL/cacert.pem:
  Regenerated expired CA certificate
SSL/client-cert.pem:
  Signed client certificate after regenerating CA certificate
SSL/server-cert.pem:
  Signed server certificate after regenerating CA certificate
2003-09-12 20:41:12 +04:00
unknown
b3d7569a8a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-12 15:50:28 +02:00
unknown
22ad721b1f Fix for BUG#1258 (Trying to use the mysqlbinlog with -h and -u option gives segmentation
fault). Fix is just initializing "host" (and "user") with 0, not a string.


client/mysqlbinlog.cc:
  command-line arguments should be initialized like in mysqldump.cc to not cause
  segfault.
2003-09-12 15:48:48 +02:00
unknown
05d054cb2a Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-09-12 13:16:59 +02:00
unknown
f61743dea8 Portability fixes:
- removed "-traditional-cpp" from the darwin6 compile flags, as it broke
   compilation with gcc-3.3 on Mac OS X and does not seem to be required 
   in general.
 - make sure to link libmysqld/examples/mysqltest.c with a C++ compiler, 
   as the embedded server library (libmysqld.a) includes C++ code. This
   broke compilation with non-gcc compilers.


configure.in:
   - removed "-traditional-cpp" from the darwin6 compile flags, as it broke
     compilation with gcc-3.3 and does not seem to be required in general.
libmysqld/examples/Makefile.am:
   - make sure to link mysqltest.c with a C++ compiler, as the embedded server
     library (libmysqld.a) includes C++ code.
2003-09-12 12:42:34 +02:00
unknown
bc4d98c7e3 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2003-09-12 01:36:28 +03:00
unknown
2af98e3642 row0sel.c:
Fix buglets in previous push


innobase/row/row0sel.c:
  Fix buglets in previous push
2003-09-12 01:35:32 +03:00
unknown
a2c6329c5a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-11 23:31:49 +02:00
unknown
deb5fda307 row0sel.c:
Fix bug: if a primary key contains more than one column, then MySQL seems to do fetch next even for a unique search condition: this in turn caused unnecessary locking which did not agree what the InnoDB manual promised


innobase/row/row0sel.c:
  Fix bug: if a primary key contains more than one column, then MySQL seems to do fetch next even for a unique search condition: this in turn caused unnecessary locking which did not agree what the InnoDB manual promised
2003-09-12 00:31:43 +03:00
unknown
0c04d1303b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-11 23:18:27 +02:00
unknown
69b8b3ff7c * Fix for BUG#1248: "LOAD DATA FROM MASTER drops the slave's db unexpectedly".
Now LOAD DATA FROM MASTER does not drop the database, instead it only tries to
create it, and drops/creates table-by-table.
* replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1'
database as a whole", as it already works for CREATE DATABASE and DROP DATABASE.


mysql-test/r/rpl000009.result:
  result update
mysql-test/t/rpl000009.test:
  test that LOAD DATA FROM MASTER does not drop databases,
  but rather table by table, thus preserving non-replicated tables.
  Test that LOAD DATA FROM MASTER reports the error when a table could not
  be dropped (system's "permission denied" for example).
  Test that LOAD TABLE FROM MASTER reports the error when the table already exists.
sql/repl_failsafe.cc:
  * replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1'
  database as a whole", as it already works for CREATE DATABASE and DROP DATABASE.
  * If a db matches replicate_*_db rules, we don't drop/recreate it because this
  could drop some tables in this db which could be slave-specific. Instead,
  we do a CREATE DATABASE IF EXISTS, and we will drop each table which has
  an equivalent on the master, table-by-table.
sql/slave.cc:
  New argument to drop the table in create_table_from_dump() 
  (LOAD TABLE/DATA FROM MASTER are the only places where this function is used).
  This is needed because LOAD DATA FROM MASTER does not drop the database anymore.
  The behaviour when the table exists is unchanged: LOAD DATA silently replaces
  the table, LOAD TABLE gives error.
sql/slave.h:
  new argument to drop the table in fetch_master_table
sql/sql_parse.cc:
  do not drop the table in LOAD TABLE FROM MASTER (this behaviour is already
  true; but changes in LOAD DATA FROM MASTER made the argument needed).
2003-09-11 23:17:28 +02:00
unknown
4d2d0eb5d8 - Added option "--skip-name-resolve" to mysql_install_db to be able to
use the local machine's IP address instead of the host name when 
   building the initial grant tables if "skip-name-resolve" has been
   specified in my.cnf. This can be helpful on FreeBSD to avoid
   thread-safety problems with the FreeBSD resolver libraries.
   (Thanks to Jeremy Zawodny for the patch)


scripts/mysql_install_db.sh:
   - Added option "--skip-name-resolve" to use the local machine's IP address
     instead of the host name when building the initial grant tables if
     "skip-name-resolve" has been specified in my.cnf (Thanks to Jeremy 
     Zawodny for the patch)
2003-09-10 17:48:43 +02:00
unknown
6d37179796 - Updated version number to 4.0.16 now that 4.0.15 has been released
- tagged ChangeSet 1.1556 as mysql-4.0.15


configure.in:
   - Bumped up version number: 4.0.15 -> 4.0.16
2003-09-10 16:48:57 +02:00
unknown
8272be9412 Cleaned up last bug fixes
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege


include/mysql.h:
  Make server_inited external
libmysqld/libmysqld.c:
  Remove reference to (wrong) external variable
mysql-test/r/grant.result:
  Fixed up grant test to not user 'user1' or 'user2'
  Check for bug in SHOW GRANTS when there is a column privilege but no table privilege
mysql-test/r/mix_innodb_myisam_binlog.result:
  Change to use tables t1 and t2
mysql-test/t/grant.test:
  Fixed up grant test to not user 'user1' or 'user2'
  Check for bug in SHOW GRANTS when there is a column privilege but no table privilege
mysql-test/t/mix_innodb_myisam_binlog.test:
  Change to use tables t1 and t2
sql/sql_acl.cc:
  Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
sql/sql_parse.cc:
  Use HAVE_REPLICATION instead of EMBEDDED_LIBRARY
2003-09-09 20:06:50 +03:00
unknown
13f0dc32f4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2003-09-08 21:47:41 +05:00
unknown
d8f676f543 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
2003-09-08 12:47:40 -04:00
unknown
82afcf7eb0 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
2003-09-08 12:46:16 -04:00
unknown
f03afbf289 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0
2003-09-08 12:16:17 -04:00
unknown
0c5145ccd9 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0


client/mysqldump.c:
  Auto merged
2003-09-08 12:15:17 -04:00
unknown
8aff7009fd fix for #1211
sql/sql_parse.cc:
  Replication's commands were allowed, but didn't have proper implementations
  for embedded library
2003-09-08 14:46:44 +05:00
unknown
2a5b413ab1 Fix for #1210
i fixed this in 4.1 in slightly different way


libmysqld/lib_sql.cc:
  Initialization's flag was made global
libmysqld/libmysqld.c:
  Check for mysql_server_init call added
2003-09-08 13:02:19 +05:00
unknown
7b107a966a fixed Bug #1184 (change type of opt_ignore_lines to longlong) 2003-09-06 18:59:04 -04:00
unknown
5193315f9d added space after first '--' in the long '----....' comment line in mysqldump
just to make it compatible with the manual
(fixed bug #1056)


client/mysqldump.c:
  added space after first '--' in the long '----....' comment line
  just to make it compatible with the manual
  (fixed bug #1056)
2003-09-06 15:06:08 -04:00
unknown
07cacdcbe7 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-09-05 17:06:36 +03:00
unknown
a65f5081ba Add QUICK as mysql-recover option in mysqld --help
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-09-05 14:44:21 +02:00
unknown
c7ef970ea5 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-05 12:05:05 +02:00
unknown
ad66d486f0 bug#926 fix undone - it caused suboptimal execution plan for "range ON, no WHERE" query
Another fix applied
2003-09-05 11:42:21 +02:00
unknown
04ff15001d after merge fixes 2003-09-05 08:16:13 +03:00
unknown
0af8b9805b Merge with 3.23 2003-09-05 06:56:28 +03:00
unknown
a91b55ce48 Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header was not updated directly after an UPDATE of split dynamic rows.
myisam/mi_locking.c:
  Added DBUG info
myisam/mi_open.c:
  Added DBUG info
myisam/mi_update.c:
  More comments
  Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header
  was not updated directly after an UPDATE of split dynamic rows.
mysql-test/r/myisam.result:
  Added test case for MyISAM UPDATE bug
mysql-test/t/myisam.test:
  Added test case for MyISAM UPDATE bug
2003-09-05 06:42:55 +03:00
unknown
a4caa4cc57 Windows fix to avoid VC++ 6.0 compiler bug, which prevents compilation when function calls are present inside an expanded inline function
innobase/fsp/fsp0fsp.c:
  Added seperate error message to avoid VC++ 6.0 compiler bug
2003-09-04 16:00:05 -04:00
unknown
3fae965102 Provide mysql_fix_privilege_tables.sql for Windows users to update grant tables (BUG #948)
Fix make_win_src_distribution


scripts/make_win_src_distribution.sh:
  Fix in case of default to .zip, use 'recode' if available
2003-09-04 12:56:02 -04:00
unknown
f0879fd9a7 bug #1172 - crash on force index() and SEL_ARG::MAYBE_KEY 2003-09-03 22:27:04 +02:00
unknown
96757dd788 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-03 19:41:01 +02:00
unknown
15cb9caea6 Better quoting patch for mysqldump
client/mysqldump.c:
  Better quoting patch
2003-09-03 18:48:10 +03:00
unknown
5e9e6eea1d Merge bgerber@bk-internal.mysql.com:/home/bk/mysql-4.0
into ou800.zenez.com:/unixware/home/mount/ou800/zenez3/zenez/bk/blg/mysql-4.0
2003-09-03 09:23:18 -06:00
unknown
fc4c66d254 Change set for gcc patch on OpenUNIX and UnixWare SCO is the OS vendor.
configure.in:
  Changes for UnixWare 7.1.X andOpenUNIX 8.0.0 to allow gcc.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-09-03 08:07:58 -06:00
unknown
f888ceb1f0 proper obligatory quoting of identifiers in mysqldump<->server communication (unrelated from command-line options) 2003-09-02 18:30:34 +02:00
unknown
e1af4a65dc Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column. 2003-09-02 21:09:28 +05:00
unknown
d63ce665c7 fixed bug #1174 2003-09-02 12:09:27 -04:00
unknown
9de22b3637 more sanity checks for compressed files, BUG#770 2003-09-02 16:49:00 +02:00
unknown
92bb23e257 bug #928 - arbitrary table grant was used, sort-order wasn't honored 2003-09-02 11:18:13 +02:00
unknown
91bbabed3b s/\t/ / in command-line help text 2003-09-02 08:37:27 +02:00
unknown
f8b8ae8a16 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-01 14:59:56 +02:00
unknown
86da2cda60 workaround for IN's special treatment of first argument. Not for 4.1 2003-09-01 14:18:27 +02:00
unknown
c8e41b5da4 - added a missing %define in the RPM spec file
(thanks to Haakon Innerdal for spotting this one)


support-files/mysql.spec.sh:
   - added a missing %define
     (thanks to Haakon Innerdal for spotting this one)
2003-09-01 12:25:39 +02:00
unknown
0683244c1f - Fixed BUG 1162 (removed macro names from the changelog)
- Really fixed BUG 998 (disable the checking for installed but
   unpackaged files)
2003-08-29 19:14:42 +02:00
unknown
54fa39256b removed stale comment
13:58 <monty> konstantin: the comment is missplaced (probably after merge).
          You can remove it


sql/sql_parse.cc:
  removed stale comment
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-08-29 14:38:39 +04:00
unknown
f2adc9f3dd Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-29 04:17:58 +03:00