Commit graph

7145 commits

Author SHA1 Message Date
unknown
dae83b4acf Merge gweir@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/4.0
2003-09-15 17:40:13 -04:00
unknown
4c8bc54b7a Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra myTest.dsp to be copied into distributions as a fix for BUG#999
BitKeeper/deleted/.del-.fgl~c7d07ad3164a2b48:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl
BitKeeper/deleted/.del-Clients and Tools.fgl~cfedc4432bdca9d:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~aa4045acaf293d36:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fdf~89b2af9ae5059f62:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.fgl~46b97f4278325e8:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fgl
BitKeeper/deleted/.del-Default.fgl~b9558db492415763:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Development.fgl~8207e98594fe0bee:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Development.fgl
BitKeeper/deleted/.del-Documentation.fgl~dbd86cfa42705734:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~1c366d3557e024bf:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-Default.rge~d816fd8cef3f06d5:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Registry Entries/Default.rge
BitKeeper/deleted/.del-MySQL 3.23.XX-GPL.ipr~3116ab4aa52a6b44:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/MySQL 3.23.XX-GPL.ipr
BitKeeper/deleted/.del-Servers.fgl~c809b9515fd51041:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Servers.fgl
BitKeeper/deleted/.del-Setup.dbg~f8ba4a87c5dd90a9:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~cb1fefacb45841a:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ino
BitKeeper/deleted/.del-Setup.ins~6946c5065a12572d:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~33bf58c825ff3ac8:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.obs
BitKeeper/deleted/.del-Setup.rul~8cc4dee41dcb733f:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.rul
BitKeeper/deleted/.del-Build.tsb~43a1c0d54abb5a44:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Default.shl~4bc5f71f8f0bd822:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Shell Objects/Default.shl
BitKeeper/deleted/.del-Default.shl~8b61f648197f5de3:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/String Tables/Default.shl
BitKeeper/deleted/.del-SETUP.BMP~1e85725234603bfe:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
BitKeeper/deleted/.del-Setup.tsb~5344bdc39c0e9884:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-infolist.txt~58b203247936d266:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-value.shl~98c2851db96b919e:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl
BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d:
  Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/.fgl
BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e:
  Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131:
  Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fgl
BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Development.fgl
BitKeeper/deleted/.del-Default.rge~2218627c2a901409:
  Delete: VC++Files/InstallShield/3.23.XXcom/Registry Entries/Default.rge
BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e:
  Delete: VC++Files/InstallShield/3.23.XXcom/MySQL 3.23.com.ipr
BitKeeper/deleted/.del-Servers.fgl~36147accb82f759:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Servers.fgl
BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ino
BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9:
  Delete: VC++Files/InstallShield/3.23.XXcom/Shell Objects/Default.shl
BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903:
  Delete: VC++Files/InstallShield/3.23.XXcom/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.obs
BitKeeper/deleted/.del-Setup.rul~14510a994d515f19:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.rul
BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97:
  Delete: VC++Files/InstallShield/3.23.XXcom/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74:
  Delete: VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28:
  Delete: VC++Files/InstallShield/3.23.XXcom/String Tables/Default.shl
BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a:
  Delete: VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d:
  Delete: VC++Files/InstallShield/3.23.XXcom/String Tables/0009-English/value.shl
BitKeeper/etc/ignore:
  Added hardcopy.0 to the ignore list
VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl:
  Add VERSION tags for automation
scripts/make_win_src_distribution.sh:
  Improved unix to DOS conversion, add processing of version tags in InstallShield files
2003-09-15 17:39:50 -04:00
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
09fda4f774 - Bumped up version number from 3.23.58 to 3.23.59 in configure.in
- Tagged ChangeSet 1.1413 as "mysql-3.23.58"


configure.in:
   - Bumped up version number from 3.23.58 to 3.23.59 in configure.in
2003-09-15 14:44:53 +02:00
unknown
c35f246bd6 fixed server crash on moving query block with pointers to same table in it (BUG#988)
removed server options


BitKeeper/deleted/.del-query_cache-master.opt~c4daeaa5e40881:
  Delete: mysql-test/t/query_cache-master.opt
mysql-test/r/query_cache.result:
  test for BUG#988
mysql-test/t/query_cache.test:
  test for BUG#988
  removed server options
sql/sql_cache.cc:
  fixed moving query block with pointers to same table in it
2003-09-15 15:16:13 +03:00
unknown
d9167cd73b Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-09-15 13:37:46 +02:00
unknown
dcf6e50d7d New Windows source package automation for 3.23
VC++Files/InstallShield/3.23.XX-com/Component Definitions/.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Component Definitions/Default.cdf:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Component Definitions/Default.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Clients and Tools.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Default.fdf:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Default.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Development.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Documentation.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Grant Tables.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Servers.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/MySQL 3.23.com.ipr:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Registry Entries/Default.rge:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.dbg:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.ino:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.ins:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.obs:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.rul:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Shell Objects/Default.shl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/String Tables/Default.shl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Text Substitutions/Build.tsb:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Text Substitutions/Setup.tsb:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add version placeholders for automation
VC++Files/InstallShield/3.23.XX-com/String Tables/0009-English/value.shl:
  Add version placeholders for automation
VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add version placeholders for automation
VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl:
  Add version placeholders for automation
scripts/Makefile.am:
  Build make_win_src_distribution script by default
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-09-12 19:58:22 -04:00
unknown
5e039416d6 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-09-13 02:26:24 +03:00
unknown
867aec2fe4 Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with
their newer DES_ versions.
Provided macros for backward compatibility.


include/my_global.h:
  Added macros for DES_ OpenSSL functions for compatibility with pre 0.9.7
sql/des_key_file.cc:
  Replaced deprecated OpenSSL des_ calls and types with newer
sql/item_strfunc.cc:
  Replaced deprecated OpenSSL des_ calls and types with newer
sql/mysql_priv.h:
  Replaced deprecated OpenSSL des_ types with newer
2003-09-12 22:33:43 +04:00
unknown
fd20a3853d merged (ul) 2003-09-12 19:53:52 +02:00
unknown
cd22f8499e merged 2003-09-12 19:42:47 +02: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
ec58974fab Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-09-12 18:27:11 +03:00
unknown
8cc642d721 Quick backport of the following bugfix from MySQL 4.0.14.
DO NOT COPY THIS CODE TO 4.0. The bugfix is better in 4.0,
but here in 3.23 we don't want to add a new error code so
we just use ER_EMPTY_QUERY. Bug was:
"If a query was ignored on the slave (because of
@code{replicate-ignore-table} and other similar rules), the slave
still checked if the query got the same error code (0, no error) as on
the master. So if the master had an error on the query (for example,
``Duplicate entry'' in a multiple-row insert), then the slave stopped
and warned that the error codes didn't match. (Bug #797)"


sql/slave.cc:
  Ignore ER_EMPTY_QUERY as it is also a marker for "query was ignored because 
  of replicate-*-table rules".
sql/sql_parse.cc:
  In a slave thread, mark an ignored query (because of replicate-*-table rules)
  as empty. The caller, exec_event(), will understand this error code as "ignorable
  query, don't compare the error codes on master and slave".
2003-09-12 17:26:48 +02:00
unknown
f03ba3a47b Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-12 16:33:49 +02: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
9ff63574a2 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-09-12 15:48:53 +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
7f659e4dad - fixed yet another C++-style comment in a .c file that made the IBM
C compiler barf
2003-09-12 15:48:05 +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
2a5e1057a2 - backported compatibility fix for extra/resolveip.c from 4.0
to be able to compile on HP-UX 10.20 (which does not have in_add_t).


extra/resolveip.c:
   - backport compatibility fix from 4.0 to be able to compile on HP-UX 10.20
     (which does not have in_add_t).
2003-09-11 13:36:08 +02:00
unknown
3f6d78f6c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-09-11 06:10:09 +03:00
unknown
876b47eeaf Remove not used define (my_strxfrm)
include/m_ctype.h:
  Remove not used define
2003-09-11 06:09:34 +03: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
b3e68622ba fixed: thread lock-up on a FLASH TABLE when another thread has an open handler
Bug#1204
2003-09-09 19:23:01 +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