mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20435 commits 2784 branches 343 tags 1.6 GiB
Commit graph

971 commits

Author SHA1 Message Date
heikki@hundin.mysql.fi
b3325a06d1 srv0start.c: 
Fix bug #5414 in 4.1: srv_max_n_threads was always set to only 1000, regardless of the buffer pool size; undelr very high concurrent loads this could cause an assertion failure in sync0arr.c line 384 when we ran out of wait slots for threads; also innodb_thread_concurrency did not work, because the wait queue also there overflowed at 1000 concurrent threads; also remove redundant code
trx0undo.c:
  Add a missing newline to fprints
 2004-09-06 13:01:29 +03:00
jan@hundin.mysql.fi
c794ace161 Fixed copy-paste bug introduced on patch (jan:1.1960). 2004-09-03 16:50:13 +03:00
jan@hundin.mysql.fi
a48db602dd Fixed unique prefix key bug for multibyte character sets (BUG #4521) for 
InnoDB. This fixes also a second part of the same problem with prefix keys
on a multibyte string column for InnoDB.
 2004-09-03 15:26:29 +03:00
jan@hundin.mysql.fi
9253e5ccfd Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-09-03 08:23:16 +03:00
heikki@hundin.mysql.fi
290443298a srv0start.c: 
Change a reference to ibman.php to a reference in the MySQL manual; someone should change the 20 other places in the source code where we still refer to ibman.php
 2004-09-02 20:06:25 +03:00
marko@hundin.mysql.fi
09f3166267 row0mysql.c: 
row_drop_table_for_mysql(): Removed duplicated block of code.
 2004-09-01 14:04:17 +03:00
jan@hundin.mysql.fi
35849854df Fixed unique prefix key bug for multibyte character sets (BUG #4521) for 
InnoDB. This fixes also a second part of the same problem with prefix keys
on a multibyte string column for InnoDB.
 2004-08-31 10:37:03 +03:00
jan@hundin.mysql.fi
4b6c341bb0 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-08-30 08:30:21 +03:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
heikki@hundin.mysql.fi
852181a21e buf0rea.c: 
Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.
 2004-08-24 20:17:23 +03:00
jan@hundin.mysql.fi
9cae7b0885 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-08-19 11:37:46 +03:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
heikki@hundin.mysql.fi
6feb6ea545 srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h: 
Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
mysqld.cc, ha_innodb.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
 2004-08-18 01:48:01 +03:00
jan@hundin.mysql.fi
656a376285 Relaxed lock wait rules so that record lock does not need to wait for a 
gap type lock.
 2004-08-17 09:45:54 +03:00
heikki@hundin.mysql.fi
5273b4e5f5 row0mysql.c: 
Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table
 2004-08-13 17:27:58 +03:00
jan@hundin.mysql.fi
7e7a22d049 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-08-13 08:32:57 +03:00
jan@hundin.mysql.fi
38255a2cad This change includes optimization for a lock wait rules and a new behaviour for 
a REPLACE command.
 2004-08-12 13:38:10 +03:00
marko@hundin.mysql.fi
d9ead8a11e InnoDB: Make UNIV_LOG_DEBUG work 2004-08-11 16:04:37 +03:00
jan@hundin.mysql.fi
664cce3f3c Take X-lock for duplicate keys in REPLACE command. 2004-08-11 13:01:30 +03:00
marko@hundin.mysql.fi
61c509fbd7 os0file.c: 
os_file_create_tmpfile(): display errno in case of failure
 2004-08-10 16:11:34 +03:00
marko@hundin.mysql.fi
cd6292d219 InnoDB: Use create_temp_file() when available 2004-08-10 14:17:32 +03:00
marko@hundin.mysql.fi
b9a8ce1b20 row0mysql.c: 
row_drop_table_for_mysql(): Removed a ut_ad() assertion that failed
  when a DROP TABLE is executed in the background.
 2004-08-09 15:38:40 +03:00
marko@hundin.mysql.fi
3cb09c9817 InnoDB: Add option for disabling innodb_status.<pid> files. 
InnoDB: Implement tmpfile() differently on Windows (Bug #3998)
 2004-08-06 15:55:50 +03:00
marko@hundin.mysql.fi
2f3e628649 dyn0dyn.h: 
dyn_array_open(): mention the size limit
mtr0log.ic, mtr0log.h:
  mlog_open(): mention the size limit
 2004-08-02 13:02:34 +03:00
marko@hundin.mysql.fi
f283baade6 Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/k/mysql-4.0
 2004-07-30 17:37:43 +03:00
marko@hundin.mysql.fi
b435b8d47e fil0fil.c: 
Restore accidentally deleted comment of fil_create_directory_for_tablename()
 2004-07-30 17:04:56 +03:00
heikki@hundin.mysql.fi
fe784f4962 row0sel.c, page0page.ic: 
Add still more diagnostic code to track buffer pool corruption in one AMD64/Linux computer
 2004-07-30 17:02:26 +03:00
marko@hundin.mysql.fi
c4ee1bcc10 dict0crea.c: 
Restore accidentally deleted comment to dict_create_sys_tables_tuple()
 2004-07-30 16:58:25 +03:00
heikki@hundin.mysql.fi
fb0b02415c buf0flu.c, os0file.c: 
Add more diagnostic code to determine when an lsn field gets corrupt; tracks a crash reported from one Itanium computer
 2004-07-27 19:14:50 +03:00
heikki@hundin.mysql.fi
1b7334c4c0 row0sel.c, page0page.ic: 
Add diagnostic code to print hex dumps and track corruption of next record offsets in an index page
 2004-07-27 09:00:17 +03:00
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
20b60510e9 InnoDB: limit the recursion depth for ON (UPDATE|DELETE) CASCADE 
(Bug #4446)
 2004-07-15 15:46:22 +03:00
heikki@hundin.mysql.fi
0614f8c718 btr0cur.c: 
Do not add + 1 to the InnoDB index cardinality estimate if the B-tree just contains one page; the fix made in March 2004 caused InnoDB systematically to overestimate the cardinality of empty or small tables by 1
 2004-07-15 09:08:51 +03:00
marko@hundin.mysql.fi
b92d70b231 lock0lock.c: 
Decrement n_lock_table_exp in lock_table_remove_low()
  instead of lock_table_dequeue().
  Do not empty lock_heap in lock_release_tables_off_kernel().
 2004-07-13 12:30:34 +03:00
marko@hundin.mysql.fi
88369368f5 InnoDB: LOCK TABLES clean-up, part 2 2004-07-12 17:14:13 +03:00
marko@hundin.mysql.fi
a323342728 InnoDB: LOCK TABLE clean-up 2004-07-12 16:47:22 +03: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
b1d08ba2b4 Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
guilhem@mysql.com
bccf57fbb2 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-1717
 2004-06-23 23:52:49 +02:00
marko@hundin.mysql.fi
5abd76355e lexyy.c, pars0lex.l: 
Document the handling of quoted strings
 2004-06-22 16:15:58 +03:00
marko@hundin.mysql.fi
4fc8a45126 Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/k/mysql-4.0
 2004-06-21 11:06:45 +03:00
monty@mysql.com
d69a36d118 merge 2004-06-21 10:24:40 +03:00
monty@mysql.com
1388c164bc After merge fixes 
Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
 2004-06-21 10:21:20 +03:00
guilhem@mysql.com
f5d6424487 Robustness feature. 
Won't be pushed as is - separate email sent for internal review.
WL#1717 "binlog-innodb consistency".
Now when mysqld starts, if InnoDB does a crash recovery, we use the binlog name
and position retrieved from InnoDB (corresponding to the last transaction
successfully committed by InnoDB) to cut any rolled back transaction from
the binary log. This is triggered by the --innodb-safe-binlog option.
Provided you configure mysqld to fsync() InnoDB at every commit (using
flush_log_at_trx_commit) and to fsync() the binlog at every write
(using --sync-binlog=1), this behaviour guarantees that a master always has
consistency between binlog and InnoDB, whenever the crash happens.
6 tests to verify that it works.
 2004-06-20 19:11:02 +02:00
heikki@hundin.mysql.fi
3cd6299b22 mem0dbg.c: 
InnoDB with UNIV_MEM_DEBUG did not compile because a global variable was forgotten when we put back mem_print_info() functions 2 days ago; add that variable
 2004-06-19 12:12:00 +03:00
marko@hundin.mysql.fi
45bc431267 mach0data.ic, mach0data.h: 
Improve documentation of mach_*write_*compressed()
mtr0log.ic, mtr0log.h:
  Improve documentation of mlog_write_initial_log_record_fast()
 2004-06-18 15:54:19 +03:00
monty@mysql.com
b11d258835 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
monty@mysql.com
fd0153304d Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173) 
Fixed problem with NULL and derived tables (Bug #4097)
Cleanup of new pushed code
 2004-06-18 03:02:29 +03:00
heikki@hundin.mysql.fi
c98bfe12c6 mem0dbg.h, mem0dbg.c: 
Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base
 2004-06-17 17:30:33 +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
0e3c22ea17 log0recv.c: 
Revert the patch that put log debug code behind UNIV_LOG_DEBUG
 2004-06-17 15:13:27 +03:00
heikki@hundin.mysql.fi
a460d438d8 log0log.h: 
Revert the patch that put log debug code behind UNIV_LOG_DEBUG
log0log.ic, log0recv.c, log0log.c, log0log.h:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
 2004-06-17 15:11:37 +03:00
heikki@hundin.mysql.fi
af35718074 Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040316101802|63386 2004-06-17 14:01:56 +03:00
heikki@hundin.mysql.fi
15dccebb0f Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613 2004-06-17 13:25:06 +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
heikki@hundin.mysql.fi
79fd0c68d3 fil0fil.c: 
Remove the use of mem_realloc in fil0fil.c; mem_realloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet
 2004-06-17 00:21:41 +03:00
heikki@hundin.mysql.fi
8ff57ee469 ut0mem.c: 
Remove printf's that were accidentally pushed in the last push
 2004-06-16 23:46:47 +03:00
heikki@hundin.mysql.fi
0aa9e45e64 ut0mem.h, ut0mem.c: 
Implement ut_realloc
lexyy.c, pars0lex.l:
  Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()
 2004-06-16 23:42:58 +03:00
heikki@hundin.mysql.fi
4a7b9fda98 mem0mem.ic, mem0mem.h: 
Remove broken mem_realloc(); a patch to remove its uses in pars0lex.l and fil0fil.c will soon follow
 2004-06-16 20:24:35 +03:00
marko@hundin.mysql.fi
30606486e7 InnoDB bug fix: mem_realloc() didn't preserve the block contents 2004-06-16 17:22:35 +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
heikki@hundin.mysql.fi
6d197336ed row0ins.c: 
Return the code of row_ins_foreign_check_on_constraint() as close to 4.0 as possible, except that we use mem_strdup() to allocate the memory for the modified table name
 2004-06-16 04:08:07 +03:00
marko@hundin.mysql.fi
dfc36c886c InnoDB: fix bug in call to innobase_invalidate_query_cache(), 
introduced in ChangeSet@1.1843.1.25
InnoDB: fix bug in the error exit of
  fil_create_new_single_table_tablespace(), introduced in
  ChangeSet@1.1843.1.11
 2004-06-16 01:55:24 +03:00
marko@hundin.mysql.fi
3af839f45a InnoDB bug fix (row0mysql.c): make reserved table names innodb_* special again 2004-06-15 22:09:09 +03:00
monty@mysql.com
8b2a735563 Portability fixes (and a typo after last merge) 2004-06-04 11:02:35 +03:00
heikki@hundin.mysql.fi
347a21e118 fil0fil.c: 
Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()
 2004-06-03 17:31:46 +03:00
heikki@hundin.mysql.fi
0dced9ea3b os0file.c, fil0fil.c: 
Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
 2004-06-03 17:02:37 +03:00
heikki@hundin.mysql.fi
8dae598aa2 fil0fil.c: 
Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'
 2004-06-02 18:19:28 +03:00
monty@mysql.com
4cb62eb001 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-02 12:14:36 +03:00
monty@mysql.com
e6c5715126 after merge fixes 2004-06-02 12:13:49 +03:00
marko@hundin.mysql.fi
82475cfb76 InnoDB cleanup: Remove debug function 
cmp_debug_dtuple_rec_with_match()
unless #ifdef UNIV_DEBUG
 2004-06-02 11:12:04 +03:00
heikki@hundin.mysql.fi
a106806324 fil0fil.c: 
Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.
 2004-06-02 08:44:08 +03:00
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
heikki@hundin.mysql.fi
aac5c88bcd row0mysql.c, row0mysql.h, ha_innodb.cc: 
Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
 2004-06-01 19:19:48 +03:00
marko@hundin.mysql.fi
a5d8f243a9 InnoDB: os0file.c: 
Do not lock raw devices or files opened for read only
 2004-06-01 17:30:46 +03:00
heikki@hundin.mysql.fi
59e44ff8d8 fil0fil.c: 
Add missing newlines in fprintfs
 2004-06-01 16:41:13 +03:00
marko@hundin.mysql.fi
2b2e7e4580 InnoDB cleanup: Fix potential buffer overflows, 
allow deletion of tablespaces whose names contain "'"
 2004-06-01 15:19:09 +03:00
marko@hundin.mysql.fi
fb9257dc45 InnoDB: Add diagnostics when tmpfile() fails at start (Bug #3919) 2004-05-28 11:15:59 +03:00
monty@mysql.com
be7f1a3570 merge with 4.0 to get fix for hpux 2004-05-28 02:04:07 +03:00
monty@mysql.com
33dcccb5bf Portability fix for HPUX 2004-05-28 02:00:34 +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
3ad2158b42 Portability fixes 2004-05-27 12:03:16 +03:00
monty@mysql.com
61a6557307 merge with 4.0 to get windows fixes 2004-05-27 00:30:28 +03:00
marko@hundin.mysql.fi
9e983e629e InnoDB fixup: remove debug assertion that causes compile error 
when UNIV_DEBUG is defined (introduced in ChangeSet@1.1850)
 2004-05-26 19:41:14 +03:00
monty@mysql.com
7d8f8bc77b Changed prototype of killed_ptr() to make it more portable 
Applied patches for Netware
 2004-05-26 19:12:49 +03:00
marko@hundin.mysql.fi
9a5dafba83 InnoDB cleanup: Remove unused code for online backup 2004-05-26 10:45:37 +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
af44187bff Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
monty@mysql.com
0babddff40 New MYSQL_SERVER_SUFFIX usage (for easier compilation) 
Update of VC++ project files.
 2004-05-25 02:28:44 +03:00
marko@hundin.mysql.fi
86d011dfee InnoDB cleanup: sync0arr.c: sync_array_cell_print(): Remove unused variable str 2004-05-24 15:43:34 +03:00
monty@mysql.com
eca917b79c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-24 15:00:12 +03:00
monty@mysql.com
56c0258536 After merge fixes 
Remove compiler warnings
Update windows project files
 2004-05-24 14:42:34 +03:00
marko@hundin.mysql.fi
40711b570a InnoDB cleanup: Remove unused functions ut_sprintf() and ut_fprintf() 2004-05-20 01:32:02 +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
monty@mysql.com
86a966256b Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
 2004-05-19 16:38:12 +03:00
heikki@hundin.mysql.fi
0189d5afe8 mem0pool.c: 
Fix a memory corruption bug: in 32-bit computers, every 4 billionth malloc outside innodb_additional_mem_pool_size was mistreated when freeing the memory; this could corrupt the InnoDB additional mem pool and could have caused crashes anywhere, also inside MySQL, or even database corruption! the bug exists also in 3.23 and 4.1; workaround: configure innodb_additional_mem_pool_size big enough
 2004-05-18 01:53:06 +03:00
heikki@hundin.mysql.fi
7ff94b3808 dict0dict.c: 
Allocate the table name buffer from the mem heap of a foreign key object rather than pointing to the name buffer in the table object; even though this apparently caused no bugs in RENAME, DROP, ALTER TABLE, or elsewhere, this convention was very prone to memory allocation bugs
 2004-05-17 17:27:25 +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
marko@hundin.mysql.fi
e58b9c62fb InnoDB cleanup: Remove unused function ut_printf() 2004-05-17 14:51:46 +03:00
marko@hundin.mysql.fi
03f19377a9 InnoDB cleanup: Add const qualifiers to many char* arguments 2004-05-17 14:40:31 +03:00
marko@hundin.mysql.fi
e6fb3e3531 InnoDB: Remove unused module sync0ipm 2004-05-17 11:11:26 +03:00
marko@hundin.mysql.fi
521c1983ee InnoDB: Remove unused module os0shm 2004-05-17 10:49:01 +03:00
monty@mysql.com
cd3dab49cc Merge with 4.0.20 2004-05-17 01:52:13 +03:00
marko@hundin.mysql.fi
a5cca9df64 InnoDB cleanup: eliminate IB__FILE__ 2004-05-14 16:06:21 +03:00
marko@hundin.mysql.fi
3c87eda7ee InnoDB: ut0mem: Remove ut_str_catenate(), add const qualifiers 2004-05-14 14:23:46 +03:00
marko@hundin.mysql.fi
3a9e590166 InnoDB: Disable file locking on FreeBSD 2004-05-14 14:11:13 +03:00
marko@hundin.mysql.fi
b4ae2577f0 InnoDB: Remove unused function ut_str_catenate() 2004-05-14 12:26:12 +03:00
heikki@hundin.mysql.fi
d2649c110a ha_innodb.cc, trx0trx.h, lock0lock.c, trx0trx.c: 
Reserve the MySQL LOCK_thread_count mutex when printing thd->query of
an arbitrary transaction; if we are printing thd->query of a transaction that
we know is currently executing inside InnoDB, then we know that MySQL cannot
meanwhile change thd->query, and no need to reserve the MySQL mutex; note
that this patch still leaves open the possibility of races in MySQL's
thd->query_len
 2004-05-13 22:07:51 +03:00
marko@hundin.mysql.fi
bd8901fd73 InnoDB: fixed bug in dict0dict.c: dict_index_name_print() 2004-05-13 15:51:02 +03:00
marko@hundin.mysql.fi
c838192066 InnoDB: Remove os_file_lock() from the 4.0 tree (unfix Bug #3608) 2004-05-13 15:28:56 +03:00
marko@hundin.mysql.fi
ecdac0a326 eval0eval.c: 
Backport suppression of MSVC++ warning from 4.1
 2004-05-12 10:40:04 +03:00
marko@hundin.mysql.fi
05a716a75f InnoDB: Replace ut_strdup() with mem_strdup() 2004-05-11 12:51:42 +03:00
marko@hundin.mysql.fi
981f6ef979 InnoDB: Changed bug reporting address to http://bugs.mysql.com 2004-05-11 11:05:02 +03:00
marko@hundin.mysql.fi
d48d5681c8 InnoDB: Fix assertion failure for orphaned tables in DROP DATABASE 2004-05-10 17:15:29 +03:00
marko@hundin.mysql.fi
c066b3022e Fix auto_inc locking bug introduced in ChangeSet@1.1794.1.1 2004-05-07 12:13:45 +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
09fc359480 InnoDB: os0file.c: Lock files exclusively (Bug #3608) 2004-05-05 11:40:17 +03:00
guilhem@mysql.com
6a6d5ef75e trying to remove Windows compiler warnings (Miguel, could you please check if it's better now?) 2004-05-03 23:35:11 +02:00
marko@hundin.mysql.fi
8ab135a71c Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/l/mysql-4.0
 2004-05-03 10:43:05 +03:00
marko@hundin.mysql.fi
a490b95b04 InnoDB: implement LOCK TABLE (Bug #3299) 2004-04-29 16:42:33 +03:00
lenz@mysql.com
7901fca494 - added AC_PROG_LIBTOOL to innobase/configure.in to be able to compile 
MySQL with InnoDB on IBM AIX 5.2 in 64bit mode (which requires a special
   AR flag)
 2004-04-29 14:48:49 +02:00
monty@mysql.com
35579a2acb Portability fix (for AIX) 2004-04-29 13:18:20 +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
heikki@hundin.mysql.fi
7d3e633edc ha_innodb.cc, sync0sync.h, sync0sync.c: 
Use only noninlined InnoDB functions in ha_innodb.cc
 2004-04-09 22:18:18 +03:00
marko@hundin.mysql.fi
9dec81b89c InnoDB: Fix a preprocessor error introduced in ChangeSet 1.1772 2004-04-08 10:47:38 +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
f7f8efc263 InnoDB: Backport fil_path_to_mysql_datadir from MySQL 4.1.x 2004-04-05 15:40:56 +03:00
marko@hundin.mysql.fi
23a5fc5558 InnoDB: ignore intra-database foreign key references between tables 
when dropping database (Bug #3058)
 2004-04-02 16:25:48 +03:00
marko@hundin.mysql.fi
cfae16667e InnoDB: Handle quotes properly in the InnoDB SQL parser 2004-04-02 11:58:54 +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
heikki@hundin.mysql.fi
f30da8edd5 fil0fil.c: 
Add assertions to check that we do not go out of bounds of io thread status array
os0file.c:
  Fix memory corruption (assertion failure on line 244 of sync0sync.c) reported by Miguel in a Windows build of MySQL-4.1.2. The bug is present in all InnoDB versions in Windows, but it depends on how the linker places a static array in srv0srv.c, whether the bug shows itself. 4 bytes were overwritten with a pointer to a statically allocated string: 'get windows aio return value'.
 2004-03-31 18:06:13 +03:00
marko@hundin.mysql.fi
7f1f7b9391 InnoDB: cleanup of B-tree cursor operations 2004-03-31 11:40:07 +03:00
marko@hundin.mysql.fi
7f2a007496 InnoDB: Remove ut_str_contains() and replace it with strchr() 2004-03-31 11:26:56 +03:00
marko@hundin.mysql.fi
16ac732cb9 InnoDB: Remove unused hash table code and parameters 2004-03-31 10:58:50 +03:00
marko@hundin.mysql.fi
3476db87a0 InnoDB: Remove unnecessary code, mostly related to stored procedures 2004-03-31 10:30:14 +03:00
marko@hundin.mysql.fi
80c37f6a92 InnoDB: parse CONSTRAINT FOREIGN KEY correctly (Bug #3332) 2004-03-30 17:26:20 +03:00
heikki@hundin.mysql.fi
86569695f7 mem0dbg.c: 
Backport from 4.1: make mem_current_allocated_memory global variable
 2004-03-26 17:49:02 +02:00
heikki@hundin.mysql.fi
d1622a941d mem0dbg.c: 
Let mem_current_allocated_memory be a global variable, because it is used in an .ic file if UNIV_MEM_DEBUG is defined
 2004-03-26 17:46:27 +02:00
monty@mysql.com
e0e0314d60 Merge with 4.0 2004-03-25 23:29:45 +02:00
heikki@hundin.mysql.fi
035778d631 sync0sync.c: 
Actually, assembler is used onnly on 32-bit x86 Win, and no need to exclude Netware specifically
 2004-03-22 18:11:13 +02:00
heikki@hundin.mysql.fi
d22f36cdfd sync0sync.c: 
Fix typo __NETWARE --> __NETWARE__ in mutex creation
 2004-03-22 18:06:26 +02:00
monty@mysql.com
59f9dcd51d Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-03-20 12:49:17 +02:00
heikki@hundin.mysql.fi
a8da91f9fb btr0btr.c: 
Correct previous bk commit comment about page splits: actually, in versions < 4.0.19 space utilization is very poor if 1500 - 8000 byte rows are inserted in the order of the primary key
 2004-03-20 06:09:18 +02:00
heikki@hundin.mysql.fi
c9bbc83d11 btr0btr.c: 
Improve space utilization if we have 3 kB - 8 kB rows to insert in the order of the primary key
btr0cur.c:
  Fix bug: The row count and key cardinality estimate was grossly too small if each clustered index page only contained one record
 2004-03-19 22:51:25 +02:00
monty@mysql.com
933278a52b merge with 4.0 (to get compiler error fixes for innodb) 2004-03-19 15:17:56 +02:00
monty@mysql.com
b7fc7188d0 Portability fixes 
Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work
 2004-03-19 14:52:48 +02:00
heikki@hundin.mysql.fi
fd15536808 trx0undo.h, trx0undo.c, trx0trx.c: 
Update an obsolete comment about trx commit: we can no longer call trx_undo_update_cleanup_by_discard(), and actually, the idea to call it was erroneous, it cannot work
 2004-03-18 14:57:22 +02:00
heikki@hundin.mysql.fi
2b16cf783f os0file.c: 
Remove includes of sys/types.h and sys/stat.h because these are already included through univ.i
 2004-03-18 08:26:49 +02:00
monty@mysql.com
19d0a60eca Don't change server suffix if given to configure 
Portability fixes
 2004-03-18 01:48:46 +02:00
monty@mysql.com
53c810cda4 merge fixes (use old code) 2004-03-18 00:16:04 +02:00
heikki@hundin.mysql.fi
e8efe9c32a Many files: 
Fix Bug #1942: do not retrieve all columns in a table if we only need the 'ref' of the row (usually, the PRIMARY KEY) to calculate an ORDER BY
 2004-03-17 19:37:48 +02:00
monty@mysql.com
f9ad650490 merge with 4.0 2004-03-17 10:36:12 +02:00
monty@mysql.com
44667503b7 After merge fixes 2004-03-17 10:30:40 +02:00
monty@mysql.com
350b433569 merge with 4.0 2004-03-16 22:41:30 +02:00
heikki@hundin.mysql.fi
a472dea224 ut0mem.h, ut0mem.c: 
Add ut_strdup
os0file.h, os0file.c:
  Add creation of directories
 2004-03-16 20:55:49 +02:00
marko@hundin.mysql.fi
e39030c027 InnoDB: Remove some debug variables unless UNIV_SEARCH_PERF_STAT is defined 2004-03-16 18:55:44 +02:00
marko@hundin.mysql.fi
20b6863c9a InnoDB: Make btr_cur_unmark_extern_fields() a static function 2004-03-16 15:26:33 +02:00
marko@hundin.mysql.fi
38ae7128f9 InnoDB: Remove unused directory "cry" 2004-03-16 12:48:17 +02:00
marko@hundin.mysql.fi
625c310b5a InnoDB: remove debug code from non-debug version 2004-03-16 12:18:02 +02:00
marko@hundin.mysql.fi
2c0cabd984 InnoDB: Remove log debug code when UNIV_LOG_DEBUG is not defined 2004-03-16 11:48:20 +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
27243b2b08 InnoDB: disable unreachable debug functions unless #ifdef UNIV_MEM_DEBUG 2004-03-12 23:26:13 +02:00
marko@hundin.mysql.fi
6e57e23b9c InnoDB: remove redundant functions mach_write() and mach_read() 2004-03-12 22:55:46 +02:00
marko@hundin.mysql.fi
9287264b6b Remove constant parameter MLOG_8BYTES from mtr_read_dulint() and mlog_write_dulint() 2004-03-12 17:44:25 +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
lenz@kallisto.local
7765418e3c - added AC_PROG_LIBTOOL to innobase/configure.in to be able to compile 
MySQL with InnoDB on IBM AIX 5.2 in 64bit mode (which requires a special
   AR flag)
 2004-03-12 15:42:26 +01:00
marko@hundin.mysql.fi
c8d6a195dc Replace ut_anp with ut_a 2004-03-12 13:46:26 +02:00
marko@hundin.mysql.fi
5b5d749294 More consistent handling of magic numbers 2004-03-11 23:12:02 +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
0a0e981220 sync0arr.c, os0file.h: 
Print always the count of pending pread() and pwrite() calls if there is a long semaphore wait
 2004-03-11 10:38:37 +02:00
heikki@hundin.mysql.fi
9d6f8a7b88 data0data.c: 
Do not test a magic number with =, use == instead :)
 2004-03-11 10:26:08 +02:00
heikki@hundin.mysql.fi
4f601cd9ef buf0lru.c: 
Add typecasts to ulong because ulint is __int64 in Win 64-bits
  Better error message to the .err log if we have to crash the server because the buffer pool is exhausted by the lock table or the adaptive hash index
 2004-03-10 11:05:02 +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
heikki@hundin.mysql.fi
a9e361856b btr0cur.c: 
Remove unused function btr_cur_update_sec_rec_in_place; besides, it was faulty, because even if strings are alphabetically identified, they can have different lengths
 2004-02-27 19:02:51 +02:00
heikki@hundin.mysql.fi
86932a0b79 row0upd.c: 
Fix bug: in a FOREIGN KEY, ON UPDATE CASCADE was not triggered if the update changed a string to another value identical in alphabetical ordering, e.g., abc -> aBc
 2004-02-27 16:54:16 +02:00
lenz@kallisto.local
5e5420f6e8 - really remove all traces of odbc 2004-02-26 19:32:42 +01:00
marko@hundin.mysql.fi
241c4d8c9f Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/m/mysql-4.0
 2004-02-25 12:55:16 +02:00
marko@hundin.mysql.fi
75ad9e5caa trx0undo.c: 
Removed bogus assertion
 2004-02-25 12:44:53 +02:00
heikki@hundin.mysql.fi
624dd4db7b ut0dbg.h: 
If there is an assertion failur refer the user to section 6.1 of the InnoDB online manual about forcing recovery
 2004-02-24 17:17:02 +02:00
marko@hundin.mysql.fi
1c1ac1fd5c Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/m/mysql-4.0
 2004-02-23 12:34:33 +02:00
marko@hundin.mysql.fi
568121c6ff configure.in: 
Removed the unused odbc directory
 2004-02-23 12:33:43 +02:00
monty@mashka.mysql.fi
1ae05760ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2004-02-22 11:01:28 +02:00
monty@mashka.mysql.fi
3b83cce5eb merge with 4.0 2004-02-22 09:50:59 +02:00
monty@mashka.mysql.fi
e74182fe52 Cleanups 2004-02-22 08:54:06 +02:00
heikki@hundin.mysql.fi
e17e1901f2 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
 2004-02-21 10:21:29 +02:00
heikki@hundin.mysql.fi
58932546e9 data0type.ic, data0type.h: 
Fix linking errors reported by Paul DuBois: UNIV_INLINE was forgotten from some inline functions
 2004-02-21 09:47:58 +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
09053c4041 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
 2004-02-20 17:42:41 +02:00
marko@hundin.mysql.fi
ff6d014b2b Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/m/mysql-4.0
 2004-02-20 16:40:25 +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
heikki@hundin.mysql.fi
af0d9a709c rem0cmp.c, data0type.c, data0type.ic, data0type.h, ha_innodb.cc: 
Remove the now redundant flag DATA_NONLATIN1; better comments
 2004-02-20 11:21:12 +02:00
heikki@hundin.mysql.fi
6417abbe94 data0type.ic, data0type.h: 
Fix a typo in a comment
 2004-02-20 09:50:33 +02:00
heikki@hundin.mysql.fi
4bed5784dd 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
 2004-02-19 20:07:02 +02:00
heikki@hundin.mysql.fi
edaf33bb72 Merge heikki@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/heikki/mysql-4.0
 2004-02-19 17:56:30 +02:00
heikki@hundin.mysql.fi
bc8721c998 que0que.c: 
Testing if bk push works
 2004-02-19 17:16:16 +02:00
heikki@hundin.mysql.fi
811e9b17ff trx0sys.c: 
Remove the downgrade 4.1.2 -> 4.0.18 patch accidentally merged from 4.0 to 4.1; the patch must NOT be merged to 4.1; this fixes Bug #2883
 2004-02-19 16:23:34 +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
38b46781ed Many files: 
Remove leading whitespace from lines containing preprocessor directives
Makefile.am:
  Remove univold.i and univoldmysql.i
 2004-02-19 11:40:36 +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
monty@mysql.com
050af89dd8 Merge with public tree 2004-02-16 10:31:05 +02:00
monty@mysql.com
f43093ec0e After merge fixes 
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
 2004-02-16 10:03:25 +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
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
heikki@hundin.mysql.fi
d9790a406c row0mysql.c: 
Allow always DROPping of a table which is only referenced by FOREIGN KEY constraints from the same table
Many files:
  Do not let REPLACE to perform internally an UPDATE if the table is referenced by a FOREIGN KEY: the manual says that REPLACE must resolve a duplicate key error semantically with DELETE(s) + INSERT, and not by an UPDATE; the internal update caused foreign key checks and cascaded operations to behave in a semantically wrong way
 2004-02-09 23:57:29 +02:00
heikki@hundin.mysql.fi
d2d1e6f726 row0mysql.c: 
Fix crash in InnoDB RENAME TABLE if 'databasename/tablename' is shorter than 5 characters (Bug #2689); reported by Sergey Petrunia
 2004-02-09 18:56:39 +02:00
heikki@hundin.mysql.fi
836e0b057a Many files: 
Fix bug #2167: generate foreign key id's locally for each table, in the form databasename/tablename_ibfk_number; if the user gives the constraint name explicitly remember it; these changes should ensure that foreign key id's in a slave are the same as in the master, and DROP FOREIGN KEY does not break replication
sync0sync.c:
  UNIV_SYNC_DEBUG caused assertion in the creation of the doublewrite buffer, if we do not allow thousands of latches per thread
 2004-02-09 01:32:00 +02:00
monty@mysql.com
7df839e757 Added testing of pthread_key_delete (to fix compile problem on SCO) (Bug #2461) 
DROP DATABASE now assumes RAID directories are in hex. (Bug #2627)
Don't increment 'select_full_range' and similar statistics for EXPLAIN queries. (Bug #2506)
Test in configure if pthread_key_delete() exists (to fix compile problem on SCO) (Bug #2461)
 2004-02-05 09:12:23 +01:00
heikki@hundin.mysql.fi
7e19a8ee65 dict0dict.c: 
Change print format of FOREIGN KEY constraints spanning multiple databases to <backquote>databasename<backquote>.<backquote>tablename<backquote>; but when parsing them we must also accept <backquote>databasename.tablename<backquote>, because that was the output format in < 4.0.18
 2004-02-02 01:05:53 +02:00
heikki@hundin.mysql.fi
b382ee2cb1 dict0dict.c: 
Change print format of FOREIGN KEY constraints spanning multiple databases to: .; but we when parsing them we must also accept , because that was the output format in < 4.0.18
 2004-02-02 01:03:05 +02:00
heikki@hundin.mysql.fi
7533b0cfff dict0dict.c: 
Remove redundant code; parse both the database name and the table name in a FOREIGN KEY constraint with quotes in mind
row0mysql.c, ha_innodb.cc, sql_table.cc:
  Return error message Cannot delete or update a parent row... if we try to drop a table which is referenced by a FOREIGN KEY constraint, and the user has not set foreign_key_checks=0
 2004-02-02 00:10:45 +02:00
heikki@hundin.mysql.fi
0216948c5b dict0dict.c: 
Cleanup
 2004-02-01 19:20:16 +02:00
monty@mysql.com
ed44e769ba Fixed parsing of column names and foreign key constraints in Innobase to handle quoted identifiers and identifiers with space. (Bug #1725) 
Fix optimizer tuning bug when first used key part was a constant. (Bug #1679)
 2004-01-30 10:46:30 +01:00
heikki@hundin.mysql.fi
49587c4244 ibuf0ibuf.c: 
Correct the comment about the ibuf record format in >= 4.1.1
 2004-01-29 15:08:22 +02:00
heikki@hundin.mysql.fi
8c49856f24 btr0cur.c: 
Fix bug: InnoDB row count and index cardinality estimates wrapped over at 512 million in 32-bit computers
 2004-01-29 14:41:49 +02:00
heikki@hundin.mysql.fi
9b04e7b9bb data0data.ic, data0data.h, row0sel.c: 
Fix bug #2483 with InnoDB, UNIQUE secondary index, and NULL values in that unique index; with the IS NULL predicate, InnoDB returned only the first matching row, though there can be many
 2004-01-27 20:10:04 +02:00
heikki@hundin.mysql.fi
d9ef69e7a1 row0sel.c: 
Remove extra mtr_start()
 2004-01-20 17:35:51 +02:00
heikki@hundin.mysql.fi
15e64c3591 row0ins.c: 
Fix bug: FOREIGN KEY ... ON UPDATE/DELETE NO ACTION must check the foreign key constraint, not ignore it. Peter Gulutzan said that NO ACTION should check the constraint as deferred, at the end of the SQL statement, while RESTRICT should check it immediately. Since we do not have defered constraints in InnoDB, this bug fix makes InnoDB to check NO ACTION constraints immediately, like it checks RESTRICT constraints.
 2004-01-14 16:21:54 +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
c6c2478f8c row0sel.c: 
Improve previous push: save 1000 bytes of thread stack in non-error cases
 2004-01-13 04:10:20 +02:00
heikki@hundin.mysql.fi
bd37416e09 row0sel.c: 
If MySQL tries to do SELECT from an InnoDB table, but has set no table locks at all in ::external_lock(), print a descriptive error message and assert; some subquery bugs were of this type
 2004-01-13 04:05:38 +02:00
heikki@hundin.mysql.fi
1bd4091470 row0mysql.c: 
Fix typo
 2004-01-08 18:56:21 +02:00
heikki@hundin.mysql.fi
18036f98ac buf0lru.c: 
Start InnoDB Monitor if 80 % of the buffer pool occupied by adaptive has or lock heaps; do not print the same warning more than 1 time
 2004-01-07 18:15:17 +02:00
heikki@hundin.mysql.fi
4c0ad9ccb6 trx0sys.c: 
DO NOT MERGE TO 4.1: forgot to change this in the previous push
 2004-01-06 20:06:07 +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
51c0fa2935 trx0sys.c: 
DO NOT MERGE TO 4.1: charset changes can cause problems in a downgrade 4.1.1 -> 4.0.18
 2004-01-06 19:50:50 +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
7bb74b6592 log0recv.h, log0recv.c: 
Merge a log replay change required by ibbackup
 2004-01-02 16:21:58 +02:00
heikki@hundin.mysql.fi
1c74cd9bf5 row0purge.c: 
Fix bug: if purge of a table was not possible because its .ibd file was missing, trx->dict_operation_lock_mode was left to a wrong value, causing an assertion failure
 2004-01-01 01:51:36 +02:00
heikki@hundin.mysql.fi
b5d9ecad52 log0log.c: 
Do not assert in log0log.c, line 856 if ib_logfiles are too small for innodb_thread_concurrency. Instead, print instructions how to adjust my.cnf and call exit(1).
 2003-12-23 22:55:38 +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
heikki@hundin.mysql.fi
df73dc7828 univ.i, ut0ut.h, ut0ut.c: 
On 64-bit Windows use InnoDB's own printf function where %lu is converted to %I64u; this eliminates Intel compiler warnings on IA64
 2003-12-19 20:39:19 +02:00
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00