monty@mysql.com
1e31199995
Merge with 4.1.3-beta
2004-07-07 11:29:39 +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
sergefp@mysql.com
ee0a516ccd
Manual merge
2004-06-14 11:18:56 +04: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
sergefp@mysql.com
5843eec521
Manual merge
2004-05-29 20:55:46 +04: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