jan@hundin.mysql.fi
3ca686c5fb
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-21 08:52:12 +03:00
jan@hundin.mysql.fi
0449396a67
Added innodb_locks_unsafe_for_binlog option. This option turns off Innodb
...
next-key locking. Using this option the locks InnoDB sets on index
records do not affect the ``gap'' before that index record. Thus, this option
allows phantom problem.
2004-07-20 14:15:38 +03:00
serg@serg.mylan
1f0cd873c5
manual merged (blame me!)
2004-07-20 00:53:24 +02:00
marko@hundin.mysql.fi
bea2f4305e
InnoDB: Increment the lock wait watchdog timeout during CHECK TABLE
...
(Bug #2694 )
2004-07-12 15:13:18 +03:00
marko@hundin.mysql.fi
74f3da33bf
srv0start.c:
...
innobase_start_or_create_for_mysql(): Rename innodb.status.<pid>
to innodb_status.<pid> to avoid problems on VMS
2004-07-12 14:12:53 +03:00
monty@mysql.com
b11d258835
Merge with 4.0.21
2004-06-18 04:38:58 +03:00
heikki@hundin.mysql.fi
3c4597e14b
que0que.c, srv0que.c:
...
Put asserts that make sure srv_que_task_enqueue() is never called under MySQL
2004-06-17 16:05:19 +03:00
heikki@hundin.mysql.fi
3b96c95fdf
srv0que.c:
...
Revert Marko's untested changeset 1.1844.1.6 to the stable 4.0 version; stable 4.0 must NOT BE modified except in case of bugs
srv0que.c, srv0que.h:
new file
2004-06-17 12:35:04 +03:00
heikki@hundin.mysql.fi
bfb0e28499
Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870
2004-06-17 11:57:45 +03:00
marko@hundin.mysql.fi
d2724e66db
InnoDB: Revert most of ChangeSet@1.1772, as the debug functions may
...
be needed when testing production releases
2004-06-16 13:41:14 +03:00
marko@hundin.mysql.fi
fc85c80b88
InnoDB cleanup:
...
Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
Remove (char*) casts of string constants; add const qualifiers
Remove some Hot Backup code unless #ifdef UNIV_HOTBACKUP
2004-05-27 15:27:43 +03:00
monty@mysql.com
390d9898f9
merge with 4.0 to get Netware patches and fixes for libmysqld.dll
2004-05-25 22:54:00 +03:00
marko@hundin.mysql.fi
7ee9540976
InnoDB cleanup and possible bug-fix: Remove srv0que
2004-05-25 20:12:09 +03:00
monty@mysql.com
56c0258536
After merge fixes
...
Remove compiler warnings
Update windows project files
2004-05-24 14:42:34 +03:00
monty@mysql.com
a4b0ec1ede
Merge with 4.0, mainly to get changes to windows project files
2004-05-20 00:54:52 +03:00
marko@hundin.mysql.fi
de76ef323a
InnoDB: srv0srv.c: Remove reference to sync0ipm.h (fix ChangeSet@1.1833)
2004-05-17 16:19:55 +03:00
monty@mysql.com
28673669a4
Merge with 4.0 to get security patch for check_grant_colum
2004-05-06 13:42:26 +03:00
monty@mysql.com
d21d49a32a
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
marko@hundin.mysql.fi
d15b0b577d
InnoDB portability fix: new function os_file_set_eof()
2004-05-05 15:54:28 +03:00
marko@hundin.mysql.fi
fc7ae6a222
InnoDB: Truncate "<datadir>/innodb.status.<pid>" to its actual size
...
(Bug #3596 )
2004-05-05 11:50:58 +03:00
marko@hundin.mysql.fi
acb54a243e
InnoDB: make UNIV_SYNC_DEBUG useable again
2004-04-28 17:03:26 +03:00
monty@mishka.local
e9cfe01db0
After merge fixes
...
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
2004-04-27 15:33:40 +03:00
monty@mishka.local
21fd1d270e
Merge with 4.0
2004-04-26 15:53:31 +03:00
marko@hundin.mysql.fi
253bf9861b
InnoDB: Remove debug functions unless #ifdef UNIV_DEBUG
2004-04-07 14:19:26 +03:00
marko@hundin.mysql.fi
6af38c65be
InnoDB: send diagnostic output to stderr or files
...
instead of stdout or fixed-size memory buffers
2004-04-06 16:14:43 +03:00
marko@hundin.mysql.fi
4da72c2eb1
Merge marko@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/j/mysql-4.0
2004-04-01 16:54:22 +03:00
marko@hundin.mysql.fi
e00bf40360
InnoDB cleanup: fixing buffer overflows and quoting of quotes
2004-04-01 16:51:34 +03:00
heikki@hundin.mysql.fi
a169bfa6ae
fil0fil.c, os0file.c, srv0srv.h, srv0srv.c:
...
Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char*
2004-04-01 09:18:32 +03:00
monty@mysql.com
350b433569
merge with 4.0
2004-03-16 22:41:30 +02:00
marko@hundin.mysql.fi
9ed26f721d
InnoDB: Replace ut_a(0) with ut_error
2004-03-13 22:48:00 +02:00
marko@hundin.mysql.fi
4573eb566c
Allow UNIV_SYNC_DEBUG to be disabled while UNIV_DEBUG is enabled
2004-03-12 17:14:51 +02:00
marko@hundin.mysql.fi
5aeab393af
Remove remaining references to the built-in ODBC driver of InnoDB
2004-03-11 16:36:19 +02:00
marko@hundin.mysql.fi
a68a1ed0ca
Remove unneeded module "com"
2004-03-11 12:55:28 +02:00
heikki@hundin.mysql.fi
995b74ee0d
srv0srv.c:
...
Protect the reading of the latest foreign key error explantion buffer with a mutex; in theory, a race condition could cause SHOW INNODB STATUS print garbage characters after the error info; remove the sprintf of the latest UNIQUE KEY error, since the buffer really was always empty
2004-03-04 15:32:16 +02:00
monty@mashka.mysql.fi
3b83cce5eb
merge with 4.0
2004-02-22 09:50:59 +02:00
monty@mashka.mysql.fi
494e43c1f5
merge with 4.0 to get security fixes and latest bug fixes
2004-02-20 17:43:02 +02:00
marko@hundin.mysql.fi
234e9abf6a
Many files:
...
Removed unused code
.del-os0trash.c~8cae5c1695501117:
Delete: innobase/os/os0trash.c
dict0crea.c:
Protect all sprintf(%s) with assertions
2004-02-20 16:34:09 +02:00
marko@hundin.mysql.fi
7acccd81dc
srv_add_path_separator_if_needed: be static; use memcpy, not sprintf
2004-02-19 14:56:19 +02:00
marko@hundin.mysql.fi
ec06c78239
Remove unnecessary files and functions
2004-02-19 14:37:39 +02:00
marko@hundin.mysql.fi
42b18e6fab
Remove unnecessary files
...
.del-univoldmysql.i~9253a6f92058c565:
Delete: innobase/include/univoldmysql.i
.del-univold.i~4b5ed652407f63f1:
Delete: innobase/include/univold.i
.del-tsut.c~4a154913fc9cd5c0:
Delete: innobase/ut/ts/tsut.c
.del-makefile~9b8356bbdb8bd94e:
Delete: innobase/ut/ts/makefile
.del-tsttrxold.c~eb6fd6091405d54e:
Delete: innobase/trx/ts/tsttrxold.c
.del-tstrx.c~5425c98548ec1e0d:
Delete: innobase/trx/ts/tstrx.c
.del-makefile~16d63c17c8edf62a:
Delete: innobase/trx/ts/makefile
.del-tsthr.c~b095667070d626a9:
Delete: innobase/thr/ts/tsthr.c
.del-makefile~d5e4661188c1939d:
Delete: innobase/thr/ts/makefile
.del-tssync.c~fed4676cd4eb8457:
Delete: innobase/sync/ts/tssync.c
.del-makefile~f23368879649c806:
Delete: innobase/sync/ts/makefile
.del-tssrv.c~b8a6f5ad9ae639c8:
Delete: innobase/srv/ts/tssrv.c
.del-tsdbc.c~d36206bdccf338f:
Delete: innobase/srv/ts/tsdbc.c
.del-makefile~da6e87ef29c12dca:
Delete: innobase/srv/ts/makefile
.del-tstcur.c~a9d5cf73b020ec41:
Delete: innobase/row/ts/tstcur.c
.del-makefile~2cdfe39689004e6:
Delete: innobase/row/ts/makefile
.del-tsrem.c~bb4e1e2e8c2ee179:
Delete: innobase/rem/ts/tsrem.c
.del-makefile~3e48a33b4970faef:
Delete: innobase/rem/ts/makefile
.del-tspage.c~f5baf63f9924e43b:
Delete: innobase/page/ts/tspage.c
.del-makefile~66de73bc499566f9:
Delete: innobase/page/ts/makefile
.del-tsosaux.c~9ec97a83392a984c:
Delete: innobase/os/ts/tsosaux.c
.del-tsos.c~f6057d3c171f5915:
Delete: innobase/os/ts/tsos.c
.del-makefile~9a1d210afa6d666e:
Delete: innobase/os/ts/makefile
.del-tsmtr.c~293250c7ebfe0d3:
Delete: innobase/mtr/ts/tsmtr.c
.del-tsbuf.c~e8d15ee095194d2c:
Delete: innobase/mtr/ts/tsbuf.c
.del-makefile~fdf4c2a4ddb23230:
Delete: innobase/mtr/ts/makefile
.del-tsmem.c~cc483e2ab96e625c:
Delete: innobase/mem/ts/tsmem.c
.del-makefile~6d58ab1de0ac572:
Delete: innobase/mem/ts/makefile
.del-tsmach.c~af65166bb53ddfe9:
Delete: innobase/mach/ts/tsmach.c
.del-makefile~b8cbd25992ee51b:
Delete: innobase/mach/ts/makefile
.del-tsha.c~13dd5ea03fda370c:
Delete: innobase/ha/ts/tsha.c
.del-makefile~1bf12ce7b2dadfd5:
Delete: innobase/ha/ts/makefile
.del-tsfsp.c~890ead1636f0eaba:
Delete: innobase/fsp/ts/tsfsp.c
.del-makefile~a466e9eb27493a80:
Delete: innobase/fsp/ts/makefile
.del-del.c~35c6283be580200:
Delete: innobase/fsp/ts/del.c
.del-tsfil.c~e554b6f3c189c081:
Delete: innobase/fil/ts/tsfil.c
.del-makefile~1df6f952a960fef4:
Delete: innobase/fil/ts/makefile
.del-tsdyn.c~6f976764b53f3191:
Delete: innobase/dyn/ts/tsdyn.c
.del-makefile~f64427335fafdc65:
Delete: innobase/dyn/ts/makefile
.del-tsdict.c~5e82f7b8ac2b2e15:
Delete: innobase/dict/ts/tsdict.c
.del-makefile~6356c424e9747647:
Delete: innobase/dict/ts/makefile
.del-tscom.c~26aae2c5c4ca1dce:
Delete: innobase/com/ts/tscom.c
.del-tscli.c~2f3e4b281141eac2:
Delete: innobase/com/ts/tscli.c
.del-makefile~608fd39568db7238:
Delete: innobase/com/ts/makefile
.del-tsos.c~1dadfc1ef69f2ba3:
Delete: innobase/buf/ts/tsos.c
.del-tsbuf.c~b4c3feee158ef154:
Delete: innobase/buf/ts/tsbuf.c
.del-makefile~598acb06bf1e466:
Delete: innobase/buf/ts/makefile
.del-tscli.c~8d35740cc1f6f864:
Delete: innobase/btr/ts/trash/tscli.c
.del-tssrv.c~ee30b746c485aec:
Delete: innobase/btr/ts/tssrv.c
.del-tss.c~21ae628550141a68:
Delete: innobase/btr/ts/tss.c
.del-tsrecv97.c~dbeb3bc494b241c1:
Delete: innobase/btr/ts/tsrecv97.c
.del-tsrecv.c~3415f8a936a8d9fd:
Delete: innobase/btr/ts/tsrecv.c
.del-tscli.c~77fc1962db99aa2e:
Delete: innobase/btr/ts/tscli.c
.del-tsbtrold5.c~72a60e768c944904:
Delete: innobase/btr/ts/trash/tsbtrold5.c
.del-tsbtrins.c~3e3bb3f95f058b46:
Delete: innobase/btr/ts/tsbtrins.c
.del-TSIT.C~f53cce6fab8d325:
Delete: innobase/btr/ts/trash/TSIT.C
.del-tsbtrfull.c~fbcbe41b64cc71b6:
Delete: innobase/btr/ts/tsbtrfull.c
.del-tsbtr97.c~84dbb84ea9fa267c:
Delete: innobase/btr/ts/tsbtr97.c
.del-makefile~491918b4162b927c:
Delete: innobase/btr/ts/makefile
.del-isql.c~bc0b8cc213905175:
Delete: innobase/btr/ts/isql.c
2004-02-19 11:32:07 +02:00
heikki@hundin.mysql.fi
25aff697d1
srv0srv.c:
...
Add a missing space to the output format of SHOW INNODB STATUS; reported by Jocelyn Fournier
2004-02-16 09:16:41 +02:00
heikki@hundin.mysql.fi
8f6f7502d1
srv0start.c, srv0srv.c:
...
If UNIV_SYNC_DEBUG was switched on, the error monitor thread could reserve a mutex BEFORE the sync debug system was initialized, and that caused a sync debug assertion in startup: move the 2 sec. sleep to a safer place; note that this is only heuristics, and in theory it can assert still
2004-01-13 17:13:03 +02:00
heikki@hundin.mysql.fi
41d0719cc3
srv0start.c:
...
More instructions about a downgrade 4.1.1 -> 4.0.18
2004-01-06 20:03:06 +02:00
heikki@hundin.mysql.fi
4fa54c1dca
trx0sys.c, srv0start.c, ibuf0ibuf.c, trx0sys.h, srv0srv.h:
...
DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet
2004-01-06 13:40:14 +02:00
heikki@hundin.mysql.fi
fe6250488e
srv0start.c:
...
Add comment that the insert buffer format changed between 4.0 and 4.1.1, but the undo log format did not
2004-01-06 13:10:57 +02:00
heikki@hundin.mysql.fi
947057e771
univ.i, srv0srv.c:
...
Define macro ULINTPF which can be used in printf statements as the print format of ulint both on Win64 and other platforms
2003-12-20 13:48:35 +02:00
heikki@hundin.mysql.fi
734870d0ce
srv0start.c, univ.i, configure.in:
...
Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime
2003-12-20 13:13:55 +02:00
monty@mysql.com
0448a3f4c0
Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
...
A after merge fix for last merge
2003-12-20 03:41:04 +02:00
monty@mysql.com
ede8169d24
Added missing SSL library (Should be in source distribution)
...
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02:00
monty@mashka.mysql.fi
cab1dc628c
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
...
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
2003-11-18 13:47:27 +02:00