Commit graph

2248 commits

Author SHA1 Message Date
unknown
f1f4bc465f Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-08-21 13:47:03 +03:00
unknown
023cbef04c Remove usage of my_dup(), as this casued error 127 when reading MyISAM tables
New definition of WEEK().


Docs/manual.texi:
  Changelog
myisam/mi_cache.c:
  Better logging on error
myisam/mi_open.c:
  Remove usage of my_dup(), as this casued error 127 when reading tables
mysql-test/r/func_time.result:
  More tests for the WEEK/YEARWEEK function
mysql-test/t/func_time.test:
  More tests for the WEEK/YEARWEEK function
sql/time.cc:
  New definition of WEEK
2001-08-21 13:44:01 +03:00
unknown
8d982e7690 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-08-20 11:21:40 -06:00
unknown
9326aa42ac fixes in mysqltest and mysqlbinlog
trying to understand why --bootstrap option does not create tables
on disk, hope the problem will be fixed when I pull, if not will
debug, but need to commit in order to pull


client/mysqltest.c:
  added safe_connect() and chaned all calls to mysql_real_connect() to
  safe_connect()
mysql-test/install_test_db.sh:
  more diagnostic
sql/log_event.cc:
  fixed compile error in mysqlbinlog
2001-08-20 11:20:47 -06:00
unknown
001f7fb5d3 manual.texi:
Fixed danish SunSite mirror


Docs/manual.texi:
  Fixed danish SunSite mirror
2001-08-20 16:02:11 +02:00
unknown
f3171b49b3 Add my_dup.c
sql/sql_parse.cc:
  cleanup
2001-08-19 15:16:52 +03:00
unknown
cfdf5fee20 Fix of UNION code
Added heap_delete_table
Added HA_EXTRA_PREPARE_FOR_DELETE
Added and use my_dup() for faster open of tables.
Removed not working no-mix-table-type


BitKeeper/deleted/.del-=6~33f33b0a159dc5d5:
  Delete: =6
heap/hp_clear.c:
  Cleanup
heap/hp_close.c:
  Added delayed delete
heap/hp_create.c:
  Added heap_delete_table
heap/hp_delete.c:
  cleanup
heap/hp_test2.c:
  Added heap_delete_table
include/heap.h:
  Added heap_delete_table
include/my_base.h:
  Added HA_EXTRA_PREPARE_FOR_DELETE
include/my_sys.h:
  Adde my_dup and set_prealloc_root
isam/extra.c:
  Added HA_EXTRA_PREPARE_FOR_DELETE
myisam/mi_check.c:
  use my_dup
myisam/mi_extra.c:
  use my_dup
myisam/mi_open.c:
  use my_dup
myisam/myisamchk.c:
  use my_dup
myisam/myisamdef.h:
  use my_dup
mysys/Makefile.am:
  my_dup
mysys/hash.c:
  Add hash_replace
mysys/mf_pack.c:
  cleanup
mysys/my_alloc.c:
  Add set_prealloc_root
mysys/my_fstream.c:
  cleanup
mysys/my_lib.c:
  cleanup
mysys/my_seek.c:
  cleanup
sql/ha_heap.cc:
  Uses heap_delete_table()
sql/mysqld.cc:
  Fix SIGHUP usage
  Remove no-mix-table-types
sql/share/czech/errmsg.txt:
  new error message
sql/share/danish/errmsg.txt:
  new error message
sql/share/dutch/errmsg.txt:
  new error message
sql/share/english/errmsg.txt:
  new error message
sql/share/estonian/errmsg.txt:
  new error message
sql/share/french/errmsg.txt:
  new error message
sql/share/german/errmsg.txt:
  new error message
sql/share/greek/errmsg.txt:
  new error message
sql/share/hungarian/errmsg.txt:
  new error message
sql/share/italian/errmsg.txt:
  new error message
sql/share/japanese/errmsg.txt:
  new error message
sql/share/korean/errmsg.txt:
  new error message
sql/share/norwegian-ny/errmsg.txt:
  new error message
sql/share/norwegian/errmsg.txt:
  new error message
sql/share/polish/errmsg.txt:
  new error message
sql/share/portuguese/errmsg.txt:
  new error message
sql/share/romanian/errmsg.txt:
  new error message
sql/share/russian/errmsg.txt:
  new error message
sql/share/slovak/errmsg.txt:
  new error message
sql/share/spanish/errmsg.txt:
  new error message
sql/share/swedish/errmsg.txt:
  new error message
sql/sql_base.cc:
  remove no-mix-table-type
sql/sql_parse.cc:
  Fix UNION code
2001-08-19 14:43:51 +03:00
unknown
e704dd7202 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-08-18 20:23:06 -06:00
unknown
87a85f7fe7 make LOAD DATA INFILE replication work with multi-character
delimiters/starters/terminators

started work on server management daemon


mysql-test/r/rpl_log.result:
  fixed result
sql/log_event.cc:
  make LOAD DATA INFILE replication
  work with multi-character delimiters/starters/terminators
sql/log_event.h:
  make LOAD DATA INFILE replication
  work with multi-character delimiters/starters/terminators
2001-08-18 20:22:20 -06:00
unknown
e3a9e7e40e New startup options and some cleanups
BitKeeper/etc/ignore:
  Added =6 to the ignore list
include/mysqld_error.h:
  Error message for no-mixing of table types..
sql/mysql_priv.h:
  New option
sql/mysqld.cc:
  New option
sql/share/english/errmsg.txt:
  Error message for no-mixing of table types..
sql/sql_base.cc:
  Checking of the mixing of table types
sql/sql_parse.cc:
  some fixes
2001-08-18 15:29:21 +03:00
unknown
a14d63ba6e Fix for handling of floats inside val_int() of +, - * and /.
Build-tools/Do-compile:
  Make shutdown safer
Docs/manual.texi:
  Fix of bad merge
sql/log.cc:
  cleanup
sql/sql_acl.cc:
  cleanup
2001-08-18 14:24:01 +03:00
unknown
b82ec23adc Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql 2001-08-18 13:13:35 +03:00
unknown
e9ec978e2d Fix for bug in the Sun Workshop compiler
BUILD/compile-solaris-sparc-purify:
  Build for purify, quantify and purecoverage
2001-08-18 13:11:58 +03:00
unknown
b6151b42c4 merge
Docs/manual.texi:
  unedit old version;  Will reapply later
2001-08-18 12:17:56 +03:00
unknown
d01f2efebf Portability fixes.
Let myisamchk generate a new checksum for compressed data.
Don't unconditionally force filenames to lower case on windows.
Update mysqltest to match 4.0 source (to get some of the new bug fixes into 3.23)


Docs/manual.texi:
  Link changes, and new comments about IA64 and about Sun workshop
client/mysqltest.c:
  Updated this to match the 4.0 source
include/config-win.h:
  Don't unconditionally force filenames to lower case on windows.
innobase/include/ut0ut.h:
  Portability fix
myisam/mi_cache.c:
  Fix problem where reported error number was -1
myisam/mi_check.c:
  Let myisamchk generate a new checksum for compressed data.
myisam/mi_packrec.c:
  Cleanup
myisam/myisamchk.c:
  Report checksum for compressed tables
mysql-test/t/bdb.test:
  Fix to match new mysqltest
mysql-test/t/err000001.test:
  Fix to match new mysqltest
mysql-test/t/fulltext.test:
  Fix to match new mysqltest
mysql-test/t/innodb.test:
  Fix to match new mysqltest
mysql-test/t/overflow.test:
  Fix to match new mysqltest
sql/ha_gemini.cc:
  Fix false -> FALSE
sql/share/estonian/errmsg.txt:
  Updated of translation
sql/share/swedish/errmsg.txt:
  Updated of translation
sql/sql_parse.cc:
  Don't unconditionally force filenames to lower case on windows.
sql/sql_table.cc:
  Don't unconditionally force filenames to lower case on windows.
sql/sql_test.cc:
  Write current directory when using 'mysqladmin debug'
strings/strto.c:
  Portability fix
strings/strtoll.c:
  Portability fix
strings/strtoul.c:
  Portability fix
strings/strtoull.c:
  Portability fix
2001-08-18 10:49:00 +03:00
unknown
724d8e1dbc Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
2001-08-17 14:19:50 -05:00
unknown
52391439cd various cleanups 2001-08-17 14:18:28 -05:00
unknown
857b5d4f43 manual.texi Fix typo
Docs/manual.texi:
  Fix typo
2001-08-17 22:05:53 +03:00
unknown
3fac95eea1 manual.texi Added a note that tablespace has to be >= 10 MB
Docs/manual.texi:
  Added a note that tablespace has to be >= 10 MB
2001-08-17 22:00:04 +03:00
unknown
57b1a50c81 ha_innobase.cc Impove ref length estimate in a handle to eliminate a warning in filesort
sql/ha_innobase.cc:
  Impove ref length estimate in a handle to eliminate a warning in filesort
2001-08-17 21:19:10 +03:00
unknown
0855ce419c manual.texi Re-added sunet.se mirror
Docs/manual.texi:
  Re-added sunet.se mirror
2001-08-17 06:14:56 -05:00
unknown
f26cd7da72 manual.texi Removed mirror in UK
Docs/manual.texi:
  Removed mirror in UK
2001-08-17 06:12:36 -05:00
unknown
6ca8d50cb1 fixed bug in Item_func_div::val_int() that broke all functions that
do val_int() on their arguments before starting the computation. 
Similar fixes are need for +-* and probably several other but I want
to make sure Monty is fine with my fix approach before changing a lot
of code. 

Amazingly,
this bug is not as critical as you would expect since very few functions do val_int()
on their arguments ( from_unixtime(), sec_to_time()), and those not
very frequently perform a computation on their floating point arguments.
which is probably why no one has yet reported this bug. Another 
possibility is that the result is usually wrong by no more than 5%,
which makes it hard to catch it. I found it when trying to compute mile
splits for 30:47 10K - it told me 5:07, and I knew it was wrong because
5:00 mile gives you 31:08. However, if I had not run as many 10K races,
I would have easily believed that 30:47 10K is a 5:07 mile pace and 
would not have noticed the bug.


mysql-test/r/func_time.result:
  another test for sec_to_time that exposes a long outstanding bug
mysql-test/t/func_time.test:
  another test for sec_to_time that exposes a long outstanding bug
sql/item_func.cc:
  fixed bug in Item_func_div::val_int()
2001-08-16 12:01:35 -06:00
unknown
12d4a5efe9 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
2001-08-15 16:15:20 -06:00
unknown
abb2aaa279 merged replication fixes from 3.23
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  merged
sql/mini_client.cc:
  merged
sql/mysqld.cc:
  merged
sql/sql_repl.cc:
  merged
2001-08-15 15:57:47 -06:00
unknown
2b8614210d Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-08-15 15:42:25 -06:00
unknown
1f4334652f improvements for stopping the slave in SLAVE STOP and on shutdown
sql/mini_client.cc:
  alarm around mc_mysql_connect()
sql/mysqld.cc:
  move end_slave() to the earlier part of shutdown
sql/sql_repl.cc:
  retry thr_alarm_kill() in case slave thread missed the signal in SLAVE STOP
2001-08-15 15:41:52 -06:00
unknown
2cd53fefa1 DocTOC Appendixes Complete! 2001-08-15 13:10:34 -05:00
unknown
051f082b37 Fix problem with not getting 'No Database Selected' error
Docs/manual.texi:
  Changelog
2001-08-15 20:09:20 +03:00
unknown
810f45462c manual.texi:
Fixed contributed software link


Docs/manual.texi:
  Fixed contributed software link
2001-08-15 17:03:09 +02:00
unknown
5cc716b159 manual.texi:
Added mirror in Hong Kong


Docs/manual.texi:
  Added mirror in Hong Kong
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-08-15 16:37:54 +02:00
unknown
46718e3492 sync0sync.c This inline assmebly does not compile on gcc-2.96 and Intel: remove it
innobase/sync/sync0sync.c:
  This inline assmebly does not compile on gcc-2.96 and Intel: remove it
2001-08-15 14:11:56 +03:00
unknown
1996d5affe Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-08-14 20:34:05 +03:00
unknown
410dd0779c Remove warnings and portability fixes
New global read lock code
Fixed bug in DATETIME with WHERE optimization
Made UNION code more general.


include/global.h:
  Remove warning on Linux Alpha
include/mysql_com.h:
  Move some C variables inside extern "C" block.
include/mysqld_error.h:
  New error mesages
myisam/mi_write.c:
  cleanup
mysql-test/r/select.result:
  Fix because of table lists now always has a database argument.
mysql-test/r/type_datetime.result:
  Test for bug with datetime and where optimization
mysql-test/r/union.result:
  Updated result
mysql-test/t/type_datetime.test:
  New test for datetime
mysql-test/t/union.test:
  More testing of error conditions
sql/item_sum.cc:
  Remove warnings on Linux Alpha
sql/item_sum.h:
  Cleanup
sql/lock.cc:
  Cleaned up global lock handling
sql/log_event.cc:
  Removed default arguments from declarations (not allowed in cxx)
sql/mysql_priv.h:
  New prototypes
sql/mysqld.cc:
  Fix for global locks
sql/opt_range.cc:
  Cleanup
sql/share/czech/errmsg.txt:
  New errors
sql/share/danish/errmsg.txt:
  New errors
sql/share/dutch/errmsg.txt:
  New errors
sql/share/english/errmsg.txt:
  New errors
sql/share/estonian/errmsg.txt:
  New errors
sql/share/french/errmsg.txt:
  New errors
sql/share/german/errmsg.txt:
  New errors
sql/share/greek/errmsg.txt:
  New errors
sql/share/hungarian/errmsg.txt:
  New errors
sql/share/italian/errmsg.txt:
  New errors
sql/share/japanese/errmsg.txt:
  New errors
sql/share/korean/errmsg.txt:
  New errors
sql/share/norwegian-ny/errmsg.txt:
  New errors
sql/share/norwegian/errmsg.txt:
  New errors
sql/share/polish/errmsg.txt:
  New errors
sql/share/portuguese/errmsg.txt:
  New errors
sql/share/romanian/errmsg.txt:
  New errors
sql/share/russian/errmsg.txt:
  New errors
sql/share/slovak/errmsg.txt:
  New errors
sql/share/spanish/errmsg.txt:
  New errors
sql/share/swedish/errmsg.OLD:
  New errors
sql/share/swedish/errmsg.txt:
  New errors
sql/sql_acl.cc:
  Use thd->host_or_ip
sql/sql_class.cc:
  Use new global lock code
sql/sql_class.h:
  host_or_ip
sql/sql_db.cc:
  host_or_ip
sql/sql_delete.cc:
  Use now global lock code
sql/sql_lex.h:
  Cleanup of not used states and variables
sql/sql_parse.cc:
  Use now global locks.
  Made UNION code more general.
  Change to use thd->hosts_or_ip.
  TABLE_LIST now always has 'db' set.
sql/sql_repl.cc:
  Portability fixes.
  Changed wrong usage of my_vsnprintf -> my_snprintf
sql/sql_select.cc:
  Changes for UNION
sql/sql_show.cc:
  Cleanup
sql/sql_union.cc:
  Handle 'select_result' outside of mysql_union().
sql/sql_yacc.yy:
  Fixes for union
2001-08-14 20:33:49 +03:00
unknown
d49afa05ae mysqlbinlog.cc #include <my_pthread.h> before thr_alarm.h
client/mysqlbinlog.cc:
  #include <my_pthread.h> before thr_alarm.h
2001-08-14 12:32:34 -04:00
unknown
bb639d60fd manual.texi Updated InnoDB section to reflect rel. .41
Docs/manual.texi:
  Updated InnoDB section to reflect rel. .41
2001-08-14 18:56:23 +03:00
unknown
aaf71625ea audio completion notification 2001-08-13 21:40:05 -06:00
unknown
acc79d65c6 fixed HUP bug, last fix was not complete 2001-08-13 20:09:21 -06:00
unknown
e4190f3492 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-08-13 16:40:36 -06:00
unknown
577f5ea1fe Replaced @strong{MySQL} with MySQL
Replaced @strong{MySQL AB} with MySQL AB
2001-08-13 14:10:46 -05:00
unknown
edccd23fce row0sel.c Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT
srv0start.c	Allow drive name followed by a ':' in a data file path
ha_innobase.cc	Allow drive name followed by a ':' in a data file path


sql/ha_innobase.cc:
  Allow drive name followed by a ':' in a data file path
innobase/srv/srv0start.c:
  Allow drive name followed by a ':' in a data file path
innobase/row/row0sel.c:
  Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT
2001-08-13 18:37:00 +03:00
unknown
97250b9c40 Cleanups
client/mysqltest.c:
  Made mysqltest compatible with 3.23
sql/slave.cc:
  Marked removable code
vio/viossl.c:
  change to use DBUG_ASSERT
2001-08-13 17:59:40 +03:00
unknown
638a96783e Fix error messages after merge from 3.23
include/mysqld_error.h:
  Fix error messages
mysql-test/t/fulltext.test:
  Fixed wrong error numbers
mysql-test/t/union.test:
  Update error numbers after merge with 3.23
sql/share/czech/errmsg.txt:
  Fix of merge
sql/share/danish/errmsg.txt:
  Updated error messages from 3.23
sql/share/dutch/errmsg.txt:
  Updated error messages from 3.23
sql/share/english/errmsg.txt:
  Updated error messages
sql/share/estonian/errmsg.txt:
  Fix of merge
sql/share/french/errmsg.txt:
  Fix of merge
sql/share/german/errmsg.txt:
  Fix of merge
sql/share/greek/errmsg.txt:
  Fix of merge
sql/share/hungarian/errmsg.txt:
  Fix of merge
sql/share/italian/errmsg.txt:
  Fix of merge
sql/share/japanese/errmsg.txt:
  Fix of merge
sql/share/korean/errmsg.txt:
  Fix of merge
sql/share/norwegian-ny/errmsg.txt:
  Fix of merge
sql/share/norwegian/errmsg.txt:
  Fix of merge
sql/share/polish/errmsg.txt:
  Fix of merge
sql/share/portuguese/errmsg.txt:
  Updated error messages
sql/share/romanian/errmsg.txt:
  Fix of merge
sql/share/russian/errmsg.txt:
  Fix of merge
sql/share/slovak/errmsg.txt:
  Fix of merge
sql/share/spanish/errmsg.txt:
  Fix of merge
sql/share/swedish/errmsg.txt:
  Fix of merge
2001-08-13 15:24:29 +03:00
unknown
91df94629d Monty, your comments ??
mysql-test/t/union.test:
  A test case for :
  
  CREATE TABLE .. SELECT .... UNION SELECT ... UNION SELECT .....
  
  and
  
  INSERT INTO ... SELECT .... UNION SELECT ... UNION SELECT ....
  
  Monty, please let me know what changes do you want me to make. 
  I could not make both in the same function, as insert requires
  that table is open.
  
  Let me know what changes to make before I plunge into:
  
  EXPLAIN SELECT ... UNION ... SELECT ......
2001-08-12 16:25:28 +03:00
unknown
89b28ebdeb Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2001-08-12 16:11:43 +03:00
unknown
02e0db5a51 Changes so that CREATE and INSERT work from UNION's
BitKeeper/etc/ignore:
  Added innobase/conftest.s1 innobase/conftest.subs sql/sql_select.cc.orig to the ignore list
2001-08-12 16:01:32 +03:00
unknown
2aed7cf90e post-merge fixes to make it compile. It still fails the fulltext test,
(wrong error code) but I'll push it so that Sergei could clean up
 my merge


include/mysqld_error.h:
  fixed typo
mysql-test/r/order_by.result:
  updated result for merged test
sql/Makefile.am:
  put back sql_union.cc lost during merge
sql/mysql_priv.h:
  restored variables lost in the merge
sql/mysqld.cc:
  put back lost variable declarations
sql/share/czech/errmsg.txt:
  merge fix
sql/share/danish/errmsg.txt:
  merge fix
sql/share/dutch/errmsg.txt:
  merge fix
sql/share/english/errmsg.txt:
  merge fix
sql/share/estonian/errmsg.txt:
  merge fix
sql/share/french/errmsg.txt:
  merge fix
sql/share/german/errmsg.txt:
  merge fix
sql/share/greek/errmsg.txt:
  merge fix
sql/share/hungarian/errmsg.txt:
  merge fix
sql/share/italian/errmsg.txt:
  merge fix
sql/share/japanese/errmsg.txt:
  merge fix
sql/share/korean/errmsg.txt:
  merge fix
sql/share/norwegian-ny/errmsg.txt:
  merge fix
sql/share/norwegian/errmsg.txt:
  merge fix
sql/share/polish/errmsg.txt:
  merge fix
sql/share/portuguese/errmsg.txt:
  merge fix
sql/share/romanian/errmsg.txt:
  merge fix
sql/share/russian/errmsg.txt:
  merge fix
sql/share/slovak/errmsg.txt:
  merge fix
sql/share/spanish/errmsg.txt:
  merge fix
sql/share/swedish/errmsg.txt:
  merge fix
sql/sql_acl.cc:
  merge fix
2001-08-11 19:54:31 -06:00
unknown
c9dbb4b726 merged
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql-bench/Makefile.am:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
Docs/manual.texi:
  merge
include/mysql_com.h:
  merge
include/mysqld_error.h:
  merge
mysql-test/install_test_db.sh:
  merge
sql/mysql_priv.h:
  merge
sql/mysqld.cc:
  merge
sql/share/czech/errmsg.txt:
  merge
sql/share/danish/errmsg.txt:
  merge
sql/share/dutch/errmsg.txt:
  merge
sql/share/english/errmsg.txt:
  merge
sql/share/estonian/errmsg.txt:
  merge
sql/share/french/errmsg.txt:
  merge
sql/share/german/errmsg.txt:
  merge
sql/share/greek/errmsg.txt:
  merge
sql/share/hungarian/errmsg.txt:
  merge
sql/share/italian/errmsg.txt:
  merge
sql/share/japanese/errmsg.txt:
  merge
sql/share/korean/errmsg.txt:
  merge
sql/share/norwegian-ny/errmsg.txt:
  merge
sql/share/norwegian/errmsg.txt:
  merge
sql/share/polish/errmsg.txt:
  merge
sql/share/portuguese/errmsg.txt:
  merge
sql/share/romanian/errmsg.txt:
  merge
sql/share/russian/errmsg.txt:
  merge
sql/share/slovak/errmsg.txt:
  merge
sql/share/spanish/errmsg.txt:
  merge
sql/share/swedish/errmsg.txt:
  merge
sql/sql_base.cc:
  merge
sql/sql_table.cc:
  merge
2001-08-11 17:28:41 -06:00
unknown
d7c5327db6 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
libmysql/libmysql.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-08-11 17:08:21 -06:00
unknown
7a4b7c4fda temp commit working on a merge
client/mysqlbinlog.cc:
  remove unused variables
sql/log_event.h:
  fix bad merge
2001-08-11 17:07:27 -06:00