Commit graph

11271 commits

Author SHA1 Message Date
unknown
54cefbab0f Merge with 4.0 to get fixed tests
mysql-test/t/lock_tables_lost_commit.test:
  Auto merged
2004-02-22 10:04:08 +02:00
unknown
2100d85c4f Move tests that uses innodb to innodb.test
mysql-test/t/lock_tables_lost_commit.test:
  Ensure that innodb is compiled in
2004-02-22 09:58:51 +02:00
unknown
192bf819eb merge with 4.0
BitKeeper/etc/ignore:
  auto-union
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisampack/myisampack.dsp:
  Auto merged
acinclude.m4:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/com/com0shm.c:
  Auto merged
innobase/data/data0data.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/ibuf0ibuf.h:
  Auto merged
innobase/include/lock0lock.h:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/include/os0proc.h:
  Auto merged
innobase/include/os0thread.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0proc.c:
  Auto merged
innobase/page/page0page.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0rec.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-02-22 09:50:59 +02:00
unknown
522e83b64a Cleanups
acinclude.m4:
  Remove innobase/libodbc
innobase/Makefile.am:
  Remove innobase/libodbc
sql/sql_delete.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Fixed wrong merge
2004-02-22 08:54:06 +02:00
unknown
984750e13e After merge fixes
Fixed wrong test of database name (affected optimization of ORDER BY)


VC++Files/client/mysqlclient.dsp:
  Add my_file.c
VC++Files/mysys/mysys.dsp:
  Add my_file.c
mysql-test/r/negation_elimination.result:
  Fix wrong test
sql-common/client.c:
  After merge fix
sql/sql_base.cc:
  Fixed testing of database name
2004-02-22 08:09:32 +02:00
unknown
f312a516cc Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0


sql/sql_yacc.yy:
  Auto merged
2004-02-22 00:40:50 +02:00
unknown
e06fbc5765 change that master_server_id is not a restricted word 2004-02-22 00:38:05 +02:00
unknown
62b22fb71a Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-02-21 20:11:47 +02:00
unknown
3dcd3d4be9 making one symbol a keyword 2004-02-21 20:10:59 +02:00
unknown
d68c56a493 Fix for BUG#2757
"--read-only gives weird error on update".
It is not fixable in 4.0 because it requires modifying
the sql/share/*/errmsg.txt files. So it is fixed in 4.1 like this:
the ER_SKIP_GRANT_TABLES is replaced by a more generic
ER_OPTION_PREVENTS_STATEMENT which can be used both for
"can't do this because of --skip-grant-tables" and
"can't do this because of --read-only" (for this we don't use
ER_CANT_UPDATE_WITH_READLOCK anymore).
So now the message for --read-only is:
"The MySQL server is running with the --read-only option so
cannot execute this statement".


include/mysqld_error.h:
  more general naming as more general message
sql/share/czech/errmsg.txt:
  message change
sql/share/danish/errmsg.txt:
  message change
sql/share/dutch/errmsg.txt:
  message change
sql/share/english/errmsg.txt:
  message change
sql/share/estonian/errmsg.txt:
  message change
sql/share/french/errmsg.txt:
  message change
sql/share/german/errmsg.txt:
  message change
sql/share/greek/errmsg.txt:
  message change
sql/share/hungarian/errmsg.txt:
  message change
sql/share/italian/errmsg.txt:
  message change
sql/share/japanese/errmsg.txt:
  message change
sql/share/korean/errmsg.txt:
  message change
sql/share/norwegian-ny/errmsg.txt:
  message change
sql/share/norwegian/errmsg.txt:
  message change
sql/share/polish/errmsg.txt:
  message change
sql/share/portuguese/errmsg.txt:
  message change
sql/share/romanian/errmsg.txt:
  message change
sql/share/russian/errmsg.txt:
  message change
sql/share/serbian/errmsg.txt:
  message change
sql/share/slovak/errmsg.txt:
  message change
sql/share/spanish/errmsg.txt:
  message change
sql/share/swedish/errmsg.txt:
  message change
sql/share/ukrainian/errmsg.txt:
  message change
sql/sql_acl.cc:
  Changes to use the more generic ER_OPTION_PREVENTS_STATEMENT
  instead of ER_SKIP_GRANT_TABLES:
  * use of net_printf() instead of send_error() (because send_error()
  does not support printf-like format).
  * in some places we now just do my_error() and return -1
  (only caller is mysql_execute_command() which does send_error()
  if result is -1).
  * Replaced my_printf_error() by simpler my_error() (except in 2 locations
  where there was a "we must use my_printf_error()" comment).
sql/sql_parse.cc:
  new error code (more generic).
2004-02-21 15:15:26 +01:00
unknown
76b80b6613 typo fixed 2004-02-21 14:32:22 +01:00
unknown
ecf6eeca60 c++ comment fixed 2004-02-21 14:25:43 +01:00
unknown
ff76e674b5 ignore:
added scripts/make_win_binary_distribution


BitKeeper/etc/ignore:
  added scripts/make_win_binary_distribution
2004-02-21 14:00:54 +01:00
unknown
b0bdf5fda2 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-02-21 11:19:11 +01:00
unknown
6855954a97 portability fixes
cleanup
2004-02-21 11:18:29 +01:00
unknown
4e17890f6a ha_innodb.cc, data0type.c, data0type.ic, data0type.h:
Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois


innobase/include/data0type.h:
  Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois
innobase/include/data0type.ic:
  Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois
innobase/data/data0type.c:
  Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois
sql/ha_innodb.cc:
  Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois
2004-02-21 10:21:29 +02:00
unknown
7934897a48 data0type.ic, data0type.h:
Fix linking errors reported by Paul DuBois: UNIV_INLINE was forgotten from some inline functions


innobase/include/data0type.h:
  Fix linking errors reported by Paul DuBois: UNIV_INLINE was forgotten from some inline functions
innobase/include/data0type.ic:
  Fix linking errors reported by Paul DuBois: UNIV_INLINE was forgotten from some inline functions
2004-02-21 09:47:58 +02:00
unknown
e8ae2f5266 fix for --open-files-limit and broken query_cache_merge.test
mysys/my_init.c:
  #include moved to mysys_priv.h
mysys/mysys_priv.h:
  #include moved to mysys_priv.h
sql/hostname.cc:
  removed unnecessary #include
2004-02-20 23:42:06 +01:00
unknown
de264ea443 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-20 23:18:32 +01:00
unknown
74fa5f09ef longer myisam keys
mysql-test/r/ctype_utf8.result:
  updated
mysql-test/r/key.result:
  updated
mysql-test/r/myisam.result:
  updated
mysql-test/r/type_blob.result:
  updated
mysql-test/t/ctype_utf8.test:
  updated
mysql-test/t/key.test:
  updated
mysql-test/t/myisam.test:
  updated
mysql-test/t/type_blob.test:
  updated
2004-02-20 20:38:34 +01:00
unknown
f0a68c5c73 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-02-20 17:53:22 +01:00
unknown
bd5930ccb2 - when removing the readline subdir for the commercial distribution,
configure.in needs to be updated and configure needs to be recreated
   for the build to succed
2004-02-20 17:52:46 +01:00
unknown
5db8fc5c27 Added missing argument to strxnmov() (Applies for windows debug mode)
libmysql/libmysql.c:
  Added missing argument to strxnmov()
2004-02-20 17:58:34 +02:00
unknown
8b2b219fb5 merge with 4.0 to get security fixes and latest bug fixes
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/include/srv0start.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysql/manager.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.cc:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Removed wrong define USE_SYMLINK
include/config-win.h:
  Use original code
innobase/srv/srv0srv.c:
  merge
innobase/usr/usr0sess.c:
  merge
libmysql/libmysql.c:
  merge
mysql-test/r/func_test.result:
  merge
mysql-test/t/func_test.test:
  merge
sql/log.cc:
  merge
sql/mysqld.cc:
  merge
2004-02-20 17:43:02 +02:00
unknown
40b8593d4e Fix name conflict with alternate capitalization
VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul.old:
  Rename: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul.old
VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul.old:
  Rename: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul.old
VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul.old:
  Rename: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul.old
2004-02-20 14:42:43 -01:00
unknown
458c4d3119 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/bk/mysql-4.0
2004-02-20 14:42:42 -01:00
unknown
c198934d62 Remove unused files
.del-odbc0odbc.c~6a372e94945263b5:
  Delete: innobase/odbc/odbc0odbc.c
.del-odbc0dummy.c~761be78656f44ad2:
  Delete: innobase/odbc/odbc0dummy.c
.del-makefilewin~15bf11ba8e0e4efe:
  Delete: innobase/odbc/makefilewin
.del-Makefile.am~f40398b15a266f24:
  Delete: innobase/odbc/Makefile.am


BitKeeper/deleted/.del-Makefile.am~f40398b15a266f24:
  Delete: innobase/odbc/Makefile.am
BitKeeper/deleted/.del-makefilewin~15bf11ba8e0e4efe:
  Delete: innobase/odbc/makefilewin
BitKeeper/deleted/.del-odbc0dummy.c~761be78656f44ad2:
  Delete: innobase/odbc/odbc0dummy.c
BitKeeper/deleted/.del-odbc0odbc.c~6a372e94945263b5:
  Delete: innobase/odbc/odbc0odbc.c
2004-02-20 17:42:41 +02:00
unknown
661c40fb1c Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/m/mysql-4.0


innobase/que/que0que.c:
  Auto merged
2004-02-20 16:40:25 +02:00
unknown
0eacf58fd5 Many files:
Removed unused code
.del-os0trash.c~8cae5c1695501117:
  Delete: innobase/os/os0trash.c
dict0crea.c:
  Protect all sprintf(%s) with assertions


BitKeeper/deleted/.del-os0trash.c~8cae5c1695501117:
  Delete: innobase/os/os0trash.c
innobase/btr/btr0sea.c:
  Removed unused code
innobase/buf/buf0buf.c:
  Removed unused code
innobase/com/com0shm.c:
  Removed unused code
innobase/data/data0data.c:
  Removed unused code
innobase/dict/dict0crea.c:
  Removed unused code
innobase/fsp/fsp0fsp.c:
  Removed unused code
innobase/ha/ha0ha.c:
  Removed unused code
innobase/include/btr0cur.h:
  Removed unused code
innobase/include/btr0sea.h:
  Removed unused code
innobase/include/buf0buf.ic:
  Removed unused code
innobase/include/data0data.h:
  Removed unused code
innobase/include/dict0crea.h:
  Removed unused code
innobase/include/dict0dict.h:
  Removed unused code
innobase/include/ibuf0ibuf.h:
  Removed unused code
innobase/include/lock0lock.h:
  Removed unused code
innobase/include/mem0dbg.h:
  Removed unused code
innobase/include/mem0mem.ic:
  Removed unused code
innobase/include/mtr0log.h:
  Removed unused code
innobase/include/mtr0mtr.h:
  Removed unused code
innobase/include/os0proc.h:
  Removed unused code
innobase/include/os0thread.h:
  Removed unused code
innobase/include/rem0cmp.ic:
  Removed unused code
innobase/include/row0row.h:
  Removed unused code
innobase/include/srv0srv.h:
  Removed unused code
innobase/include/sync0sync.h:
  Removed unused code
innobase/lock/lock0lock.c:
  Removed unused code
innobase/log/log0recv.c:
  Removed unused code
innobase/mem/mem0dbg.c:
  Removed unused code
innobase/mtr/mtr0mtr.c:
  Removed unused code
innobase/os/os0proc.c:
  Removed unused code
innobase/page/page0page.c:
  Removed unused code
innobase/que/que0que.c:
  Removed unused code
innobase/rem/rem0cmp.c:
  Removed unused code
innobase/row/row0ins.c:
  Removed unused code
innobase/row/row0mysql.c:
  Removed unused code
innobase/row/row0row.c:
  Removed unused code
innobase/srv/srv0srv.c:
  Removed unused code
innobase/srv/srv0start.c:
  Removed unused code
innobase/sync/sync0sync.c:
  Removed unused code
innobase/trx/trx0rec.c:
  Removed unused code
innobase/trx/trx0trx.c:
  Removed unused code
innobase/ut/ut0dbg.c:
  Removed unused code
innobase/ut/ut0mem.c:
  Removed unused code
innobase/ut/ut0ut.c:
  Removed unused code
2004-02-20 16:34:09 +02:00
unknown
9977ce0c71 after review changes
sql/sql_class.h:
  changed methods names
sql/sql_prepare.cc:
  changed methods names
  removed incorrect comments
  added error handler
2004-02-20 16:24:03 +02:00
unknown
7dd164f730 after review fix
sql/item.h:
  typo fixed
sql/item_func.h:
  clear refernce on deleted variable
sql/item_subselect.cc:
  layout fixed
sql/sql_base.cc:
  temporary memory pool allocation moved from open_and_lock_tables
sql/sql_prepare.cc:
  temporary memory pool allocation moved
  changing in routine suggeted by Monty
tests/client_test.c:
  uncomment accidently commented test
2004-02-20 15:37:45 +02:00
unknown
89945d1d32 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-02-20 12:02:59 +01:00
unknown
2bd261a153 \| is sed is on-portable 2004-02-20 12:02:34 +01:00
unknown
36d2d2061b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-prepared-4.1
2004-02-20 13:02:05 +02:00
unknown
46a07dbc5f rem0cmp.c, data0type.c, data0type.ic, data0type.h, ha_innodb.cc:
Remove the now redundant flag DATA_NONLATIN1; better comments


sql/ha_innodb.cc:
  Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/include/data0type.h:
  Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/include/data0type.ic:
  Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/data/data0type.c:
  Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/rem/rem0cmp.c:
  Remove the now redundant flag DATA_NONLATIN1; better comments
2004-02-20 11:21:12 +02:00
unknown
6226e45b7b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2237
2004-02-20 12:18:48 +04:00
unknown
3711e24a86 Fix for (Segfault in mysql_stmt_close)
Problem was that we checked for existing connection in stmt_close
and did not free(stmt) if it's closed (that didn't work well with
embedded)
I just added new flag to the stmt_close and now we check it instead
of connection


libmysql/client_settings.h:
  declaration changed
libmysql/libmysql.c:
  stmt_close and it's calls modified
sql-common/client.c:
  stmt_close call modified
2004-02-20 12:18:06 +04:00
unknown
2b5020e127 data0type.ic, data0type.h:
Fix a typo in a comment


innobase/include/data0type.h:
  Fix a typo in a comment
innobase/include/data0type.ic:
  Fix a typo in a comment
2004-02-20 09:50:33 +02:00
unknown
e5245d94ec Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-prepared-4.1
2004-02-20 07:41:06 +02:00
unknown
51a6b4f47a Safety fixes (strnmov -> strmake)
sql/mysqld.cc:
  Safety fix
sql/set_var.cc:
  Safety fix
sql/sql_db.cc:
  indentation cleanup
2004-02-20 00:26:05 +02:00
unknown
5367d17cd4 fixed for BUG "Heap tables status shows wrong or missing data"
heap/hp_delete.c:
  added code for right calculation 
  of Index_length in HEAP tables with BTREE indexes
heap/hp_write.c:
  added code for right calculation 
  of Index_length in HEAP tables with BTREE indexes
mysql-test/r/show_check.result:
  added test for BUG  "Heap tables status shows wrong or missing data"
mysql-test/t/show_check.test:
  added test for BUG  "Heap tables status shows wrong or missing data"
2004-02-20 00:33:16 +04:00
unknown
ea9aa4d352 Major work on Windows build automation-- add binary packaging, suffixes
Build-tools/Do-win-build:
  Add suffix option, classic build, binary packaging
VC++Files/comp_err/comp_err.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/myisampack/myisampack.dsp:
  Update project file -- binary goes to ../client_release now
scripts/Makefile.am:
  Add make_win_binary_distribution to Makefile (for @VERSION@)
2004-02-19 19:04:47 -01:00
unknown
9bc5cdba41 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0


libmysql/libmysql.c:
  Auto merged
2004-02-19 22:04:46 +02:00
unknown
68242939d8 Fixed usage of strxnmov() in recent changesets
libmysql/libmysql.c:
  szPipeName -> pipe_name
  fixed usage of strxnmov()
mysys/mf_tempfile.c:
  Fixed usage of strnxmov()
  Simple optimization
mysys/my_tempnam.c:
  Fixed usage of strnxmov()
  Simple optimization
sql/log.cc:
  simple optimization
sql/mini_client.cc:
  szPipeName -> pipe_name
  fixed usage of strxnmov()
sql/mysqld.cc:
  szPipeName -> pipe_name
  fixed usage of strxnmov()
  Fixed indentation
2004-02-19 22:04:31 +02:00
unknown
035ac2917c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-02-19 20:50:43 +02:00
unknown
bc0c36a46f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-prepared-4.1


sql/mysql_priv.h:
  Auto merged
2004-02-19 20:10:49 +02:00
unknown
403255b887 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2004-02-19 20:07:03 +02:00
unknown
be8979436a Many files:
Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again


sql/ha_innodb.cc:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
innobase/data/data0type.c:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
innobase/dict/dict0crea.c:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
innobase/dict/dict0load.c:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
innobase/include/data0type.h:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
innobase/include/data0type.ic:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
innobase/rem/rem0cmp.c:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
2004-02-19 20:07:02 +02:00
unknown
e022b27860 Fix for a bug .
Multi-table delete's with tables having foreign key constraints
did not return the error.

Also added tests for multi-table updates.
2004-02-19 19:43:46 +02:00
unknown
fe92b2794b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2004-02-19 19:38:47 +02:00