Commit graph

16 commits

Author SHA1 Message Date
unknown
6068405ca6 Merge work:/my/mysql into donna.mysql.fi:/home/my/bk/mysql
sql/ha_innobase.cc:
  Auto merged
2001-03-06 20:39:10 +02:00
unknown
08d7d5cf33 Patch from sleepycat to fix problem with BDB and log files
Print full command name to log files
Convert table type to supported onces on ALTER TABLE


Docs/manual.texi:
  Updates from user comments
bdb/log/log_rec.c:
  Patch from sleepycat to fix problem with log files
innobase/ibuf/Makefile.am:
  Don't let make do bk get
innobase/include/Makefile.am:
  Don't let make do bk get
man/Makefile.am:
  Don't let make do bk get
myisam/mi_dbug.c:
  Print warning to debug log
mysql-test/mysql-test-run.sh:
  Don't use innobase in replica
mysql-test/r/null_key.result:
  Fix for new key lengths
sql/ha_innobase.cc:
  Free hash cache at end
sql/log.cc:
  Print full command name to log files
sql/sql_table.cc:
  Convert table type to supported onces on ALTER TABLE
2001-03-06 20:38:53 +02:00
unknown
e58c192538 trx0trx.h Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
row0ins.c	Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
row0mysql.c	Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
row0mysql.h	Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
ha_innobase.cc	Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs


sql/ha_innobase.cc:
  Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
innobase/include/row0mysql.h:
  Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
innobase/include/trx0trx.h:
  Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
innobase/row/row0ins.c:
  Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
innobase/row/row0mysql.c:
  Innobase now returns the key number in a duplicate key error, removed innobase/include from make dirs
2001-03-06 19:45:10 +02:00
unknown
a9c60a41fe Merge work:/my/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2001-03-06 15:26:13 +02:00
unknown
869c89feaa Merged some functions and removed some unused client functions.
Remember UNION for ALTER TABLE
Added test for if we are supporting transactions.
Don't allow REPLACE to replace a row when we have generated an auto_increment key
Fixed bug when using BLOB keys
Fixed bug in SET @variable=user.


Docs/manual.texi:
  Added some examples and moved the Error access denied section to the
  error section.
client/mysqltest.c:
  Changed to use the new mysql_send_query()
include/mysql.h:
  Changed mysql_reap_query() to mysql_send_query().
libmysql/libmysql.c:
  Changed mysql_reap_query() to mysql_send_query()
  Merged some functions and removed some unused functions.
mysql-test/r/bdb.result:
  New test case
mysql-test/r/distinct.result:
  New test case
mysql-test/r/key.result:
  New test case
mysql-test/r/merge.result:
  New test case
mysql-test/r/replace.result:
  New test case
mysql-test/t/bdb.test:
  New test case
mysql-test/t/key.test:
  New test case
mysql-test/t/merge.test:
  New test case
mysql-test/t/replace.test:
  New test case
mysys/my_lock.c:
  Moved global lock variable to static
sql-bench/test-insert.sh:
  Added test case for index-read only
sql/field.h:
  Fixed that one can optimize ORDER BY with ISAM and GEMINI
sql/ha_berkeley.cc:
  Added type casts needed for Windows
sql/ha_innobase.cc:
  Removed reference to manual from comment.
sql/ha_myisammrg.cc:
  Remember UNION for ALTER TABLE
sql/ha_myisammrg.h:
  Remember UNION for ALTER TABLE
sql/handler.cc:
  Added test for if we are supporting transactions.
  Don't allow REPLACE to replace a row when we have generated an auto_increment key.
sql/handler.h:
  Remember UNION for ALTER TABLE
sql/key.cc:
  Fixed bug when using BLOB keys
sql/mysql_priv.h:
  Added new variables
sql/mysqld.cc:
  Added new variables
sql/opt_range.cc:
  Fixed problem with BLOB keys
sql/opt_sum.cc:
  Fix for BLOB keys
sql/sql_class.cc:
  Added test if we need to init/clean transaction variables
sql/sql_insert.cc:
  Fix for REPLACE and auto_increment keys
sql/sql_parse.cc:
  Fixed bug in max_user_connections
sql/sql_select.cc:
  Fixed problem with key on BLOB
sql/sql_yacc.yy:
  Fixed bug in SET @variable=user.
sql/table.cc:
  Fixed problem with keys on BLOB
2001-03-06 15:24:08 +02:00
unknown
1cc8058b1b Fix minor typos (not bugs).
Docs/manual.texi:
  Minor typo fix.
sql/ha_innobase.cc:
  Fix minor cut-n-paste errors in change_active_index().
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-03-04 15:05:20 -05:00
unknown
3be063eab8 row0sel.c Removes now trailing spaces from varchars
srv0start.c	Removes now trailing spaces from varchars
row0mysql.ic	Removes now trailing spaces from varchars
ha_innobase.cc	Removes now trailing spaces from varchars


sql/ha_innobase.cc:
  Removes now trailing spaces from varchars
innobase/include/row0mysql.ic:
  Removes now trailing spaces from varchars
innobase/row/row0sel.c:
  Removes now trailing spaces from varchars
innobase/srv/srv0start.c:
  Removes now trailing spaces from varchars
2001-03-02 19:07:29 +02:00
unknown
59eafdac11 ha_innobase.cc Fixed a bug in ha_innobase.cc in auto_increment
sql/ha_innobase.cc:
  Fixed a bug in ha_innobase.cc in auto_increment
2001-03-01 19:43:29 +02:00
unknown
0e8f420fd2 ha_innobase.cc Fix autocommit in ha_innobase.cc
sql/ha_innobase.cc:
  Fix autocommit in ha_innobase.cc
2001-02-23 16:35:59 +02:00
unknown
6839b1728d Fixes for innobase
Added test for ALTER TABLE ORDER BY


BUILD/FINISH.sh:
  Fixes for innobase
BUILD/compile-pentium-debug:
  Fixes for innobase
Docs/manual.texi:
  Fixes for innobase
include/my_pthread.h:
  Fixes for innobase
innobase/Makefile.am:
  Fixes for innobase
innobase/btr/Makefile.am:
  Fixes for innobase
innobase/data/Makefile.am:
  Fixes for innobase
innobase/eval/Makefile.am:
  Fixes for innobase
innobase/include/Makefile.i:
  Fixes for innobase
innobase/os/Makefile.am:
  Fixes for innobase
mysql-test/t/alter_table.test:
  Added test for ALTER TABLE ORDER BY
mysys/my_error.c:
  Skip 'l' in '%lu'
mysys/my_vsnprintf.c:
  cleanup
sql/ha_innobase.cc:
  Fixed type + remove warnings
sql/ha_innobase.h:
  Remove warnings
sql/handler.cc:
  cleanup
sql/sql_class.cc:
  remove warnings
sql/sql_parse.cc:
  remove warnings
sql/sql_table.cc:
  Fixed bug in ALTER TABLE ... ORDER BY
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-02-21 14:16:00 +02:00
unknown
62884b8f36 Added max_user_connections
Fixes for Innobase
Don't reset whole to-buffer in strxnmov


BUILD/compile-pentium-debug:
  Added innobase
include/mysqld_error.h:
  New error messages
innobase/configure.in:
  Update from heikki
innobase/include/lock0types.h:
  Update from heikki
innobase/include/os0sync.h:
  Update from heikki
innobase/include/sync0types.h:
  Update from heikki
innobase/os/os0file.c:
  Update from heikki
innobase/srv/srv0start.c:
  Update from heikki
sql/ha_innobase.cc:
  Update from Heikki
  Changed assert -> dbug_assert
  Changed return -> DBUG_RETURN
sql/mysql_priv.h:
  Added max_user_connections
sql/mysqld.cc:
  Added max_user_connections
sql/share/czech/errmsg.txt:
  Added max_user_connections
sql/share/danish/errmsg.txt:
  Added max_user_connections
sql/share/dutch/errmsg.txt:
  Added max_user_connections
sql/share/english/errmsg.txt:
  Added max_user_connections
sql/share/estonian/errmsg.txt:
  Added max_user_connections
sql/share/french/errmsg.txt:
  Added max_user_connections
sql/share/german/errmsg.txt:
  Added max_user_connections
sql/share/greek/errmsg.txt:
  Added max_user_connections
sql/share/hungarian/errmsg.txt:
  Added max_user_connections
sql/share/italian/errmsg.txt:
  Added max_user_connections
sql/share/japanese/errmsg.txt:
  Added max_user_connections
sql/share/korean/errmsg.txt:
  Added max_user_connections
sql/share/norwegian-ny/errmsg.txt:
  Added max_user_connections
sql/share/norwegian/errmsg.txt:
  Added max_user_connections
sql/share/polish/errmsg.txt:
  Added max_user_connections
sql/share/portuguese/errmsg.txt:
  Added max_user_connections
sql/share/romanian/errmsg.txt:
  Added max_user_connections
sql/share/russian/errmsg.txt:
  Added max_user_connections
sql/share/slovak/errmsg.txt:
  Added max_user_connections
sql/share/spanish/errmsg.txt:
  Added max_user_connections
sql/share/swedish/errmsg.OLD:
  Added max_user_connections
sql/share/swedish/errmsg.txt:
  Added max_user_connections
sql/sql_class.h:
  cleanup
strings/str_test.c:
  Added tests for strxnmov
strings/strxnmov.c:
  Don't reset whole to buffer
2001-02-20 22:34:47 +02:00
unknown
a772844b42 Cleaned up ha_innobase.cc from whitespace
sql/ha_innobase.cc:
  Removed some whitespace
2001-02-18 00:04:51 +02:00
unknown
2662b59306 Added Innobase to source distribution
Docs/manual.texi:
  Added Innobase documentation
configure.in:
  Incremented version
include/my_base.h:
  Added option for Innobase
myisam/mi_check.c:
  cleanup
mysql-test/t/bdb.test:
  cleanup
mysql-test/t/innobase.test:
  Extended with new tests from bdb.test
mysql-test/t/merge.test:
  Added test of SHOW create
mysys/my_init.c:
  Fix for UNIXWARE 7
scripts/mysql_install_db.sh:
  Always write how to start mysqld
scripts/safe_mysqld.sh:
  Fixed type
sql/ha_innobase.cc:
  Update to new version
sql/ha_innobase.h:
  Update to new version
sql/handler.h:
  Added 'update_table_comment()' and 'append_create_info()'
sql/sql_delete.cc:
  Fixes for Innobase
sql/sql_select.cc:
  Fixes for Innobase
sql/sql_show.cc:
  Append create information (for MERGE tables)
sql/sql_update.cc:
  Fixes for Innobase
2001-02-17 14:19:19 +02:00
unknown
49a45d272b Updates for innobase 2001-01-12 13:53:06 +02:00
unknown
29fa72526a Fixed --no-defaults in mysqltest
BUILD/compile-pentium-debug:
  Use /usr/local/BerkeleyDB-dbug/ if available
BUILD/compile-pentium:
  Use /usr/local/BerkeleyDB-opt/ if available
Docs/internals.texi:
  Added 'unedited' documentation for mysys functions
Docs/manual.texi:
  Cleanups
client/mysql.cc:
  Added client language to status
client/mysqltest.c:
  Fixed bug with --no-defaults
heap/_check.c:
  Added option to print status.
heap/hp_close.c:
  Update to use new status interface
heap/hp_hash.c:
  Clean up hash function and add new experimental hash
heap/hp_test1.c:
  Update to use new status interface
heap/hp_test2.c:
  Update to use new status interface
include/heap.h:
  Update to use new status interface
mysql-test/r/key_diff.result:
  Cleanup tests that may give rows in random order
mysql-test/r/type_blob.result:
  Removed \r from output as this confused bk
mysql-test/t/key_diff.test:
  Cleanup tests that may give rows in random order
BitKeeper/etc/ignore:
  Added Docs/my_sys.doc to the ignore list
mysql-test/t/type_blob.test:
  Removed \r from output as this confused bk
mysys/hash.c:
  Add new experimental hash function
scripts/safe_mysqld.sh:
  Added --mysqld option
sql/ha_innobase.cc:
  Fixed store_locking
sql/mysqld.cc:
  Cleaned up warning messages
2000-12-29 16:06:10 +02:00
unknown
7bdbe353f8 Added innobase handler files + other updates for innobase
Docs/manual.texi:
  Changelog
client/mysql.cc:
  Added optional argument to --i-am-a-dummy
sql/handler.cc:
  Fix for innobase
sql/handler.h:
  Fix for innobase
sql/sql_class.cc:
  Fix for innobase
sql/sql_db.cc:
  Fixed that DROP DATABASE works on OS/2
2000-12-06 01:54:17 +02:00