unknown
79229d6d42
eval0eval.c:
...
Backport suppression of MSVC++ warning from 4.1
innobase/eval/eval0eval.c:
Backport suppression of MSVC++ warning from 4.1
2004-05-12 10:40:04 +03:00
unknown
64d2ddbf4e
- Bumped up version number from 4.0.19 -> 4.0.20
...
- Tagged ChangeSet@1.1800.1.1 as "mysql-4.0.19"
configure.in:
- Bumped up version number from 4.0.19 -> 4.0.20
2004-05-12 01:23:27 +02:00
unknown
699cbc02cc
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-05-11 12:20:04 +02:00
unknown
76bc677117
bug#3612 - Item_func_div set decimals incorrectly
2004-05-11 12:19:37 +02:00
unknown
5b00724963
InnoDB: Changed bug reporting address to http://bugs.mysql.com
...
innobase/btr/btr0btr.c:
Changed bug reporting address to http://bugs.mysql.com
innobase/dict/dict0load.c:
Changed bug reporting address to http://bugs.mysql.com
innobase/ibuf/ibuf0ibuf.c:
Changed bug reporting address to http://bugs.mysql.com
innobase/lock/lock0lock.c:
Changed bug reporting address to http://bugs.mysql.com
innobase/row/row0ins.c:
Changed bug reporting address to http://bugs.mysql.com
innobase/row/row0sel.c:
Changed bug reporting address to http://bugs.mysql.com
innobase/row/row0umod.c:
Changed bug reporting address to http://bugs.mysql.com
innobase/row/row0upd.c:
Changed bug reporting address to http://bugs.mysql.com
innobase/trx/trx0rec.c:
Changed bug reporting address to http://bugs.mysql.com
innobase/ut/ut0dbg.c:
Changed bug reporting address to http://bugs.mysql.com
2004-05-11 11:05:02 +03:00
unknown
9e18773c7a
Merge marko@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/j/mysql-4.0
2004-05-10 17:16:29 +03:00
unknown
b89bb86751
InnoDB: Fix assertion failure for orphaned tables in DROP DATABASE
...
innobase/row/row0mysql.c:
Compare database part of table name with memcmp(), not strcmp()
2004-05-10 17:15:29 +03:00
unknown
2abb48defb
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug2831
2004-05-10 13:54:32 +02:00
unknown
2b4a56b9f3
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-05-10 12:39:31 +02:00
unknown
0bfea087af
backport from 4.1:
...
"phrase search" should not match partial words (it should not match 'paraphrase searches')
2004-05-10 12:39:01 +02:00
unknown
415459545d
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug2831
2004-05-10 12:36:09 +02:00
unknown
3f46a5fd60
Fix replace_result of $MASTER_MYPORT instead of literal numbers.
...
mysql-test/t/rpl000015.test:
Fix replace_result of $MASTER_MYPORT instead of literal numbers.
The test case rpl000015 needs one exlpicit literal number.
It changes partial master settings, which seems to reset other settings
to their defaults. To test this is obviously the intent of this case.
2004-05-10 12:15:40 +02:00
unknown
bd4be3f1b9
Merge marko@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-05-07 12:17:11 +03:00
unknown
95600183df
Fix auto_inc locking bug introduced in ChangeSet@1.1794.1.1
...
innobase/row/row0mysql.c:
Revert accidental modification to row_lock_table_autoinc_for_mysql()
made in ChangeSet@1.1794.1.1
mysql-test/r/innodb.result:
Revert ChangeSet@1.1794.1.1
2004-05-07 12:13:45 +03:00
unknown
146019b593
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug2831
BitKeeper/etc/logging_ok:
auto-union
2004-05-07 10:42:08 +02:00
unknown
ae2b73a55f
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into a80-186-24-72.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
2004-05-07 01:03:14 +03:00
unknown
b20399d9d6
Fixed a problem with option --where, which earlier was not dynamic. One was not able
...
to use long query strings with it.
Bug#3633
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
2004-05-07 01:02:57 +03:00
unknown
6c9dc830b2
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-06 22:55:57 +02:00
unknown
9bf1414317
A DBUG_RETURN to match a DBUG_ENTER
...
myisam/mi_dynrec.c:
need DBUG_RETURN as we DBUG_ENTER
2004-05-06 22:55:30 +02:00
unknown
392757a214
Fix a forgotten skip of space at line begin for the 'system' command.
...
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
2004-05-06 16:15:46 +02:00
unknown
2d776e36d8
Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0
...
sql/sql_acl.cc:
Auto merged
2004-05-06 11:42:35 +03:00
unknown
33359d0b66
Remove not used variable
2004-05-06 11:42:23 +03:00
unknown
bfa22229eb
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-05 21:51:26 +02:00
unknown
601bdde5ed
very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err,
...
and a comment update
mysql-test/r/rpl_server_id2.result:
result update
mysql-test/t/rpl_server_id2.test:
We stop the slave before cleaning up otherwise we'll get
'drop table t1' executed twice, so an error in the slave.err
(not critical).
sql/slave.cc:
update comment about 4.1 now that 4.1 is fixed (in a few minutes, exactly)
2004-05-05 21:50:51 +02:00
unknown
48260e9d92
InnoDB portability fix: new function os_file_set_eof()
...
innobase/include/os0file.h:
Add os_file_set_eof()
innobase/os/os0file.c:
Add os_file_set_eof()
innobase/srv/srv0srv.c:
Replace chsize() or ftruncate() with os_file_set_eof()
sql/ha_innodb.cc:
Replace my_chsize() with os_file_set_eof()
2004-05-05 15:54:28 +03:00
unknown
7d918f213e
Portability fix
2004-05-05 14:40:44 +03:00
unknown
b33f8fa778
InnoDB: Truncate "<datadir>/innodb.status.<pid>" to its actual size
...
(Bug #3596 )
innobase/srv/srv0srv.c:
Truncate "<datadir>/innodb.status.<pid>" to its actual size (Bug #3596 )
sql/ha_innodb.cc:
Truncate "<datadir>/innodb.status.<pid>" to its actual size (Bug #3596 )
2004-05-05 11:50:58 +03:00
unknown
f44fb5fd89
InnoDB: os0file.c: Lock files exclusively (Bug #3608 )
...
innobase/os/os0file.c:
Lock files unless #defined __WIN__ or UNIV_HOTBACKUP (Bug #3608 )
2004-05-05 11:40:17 +03:00
unknown
aee9a54886
Merge marko@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-05-05 10:15:43 +03:00
unknown
e35921a112
Fixes to Windows project files for 4.0.19
...
VC++Files/client/mysqlclient.dsp:
Add strxnmov to project files
VC++Files/mysql.dsw:
Add dependency to prevent compile error
2004-05-04 21:47:39 -01:00
unknown
40dba5a82f
useless fixes for --report-password and --show-slave-auth-info (almost undocumented options),
...
just for beauty of truth.
sql/mysqld.cc:
correcting sentence (even if option is not really usable,
as it depends on report-user and report-password which are undocumented
(and will stay like this)).
sql/slave.cc:
report password when you must report password.
2004-05-04 16:35:31 +02:00
unknown
a1ec6140d2
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-04 15:49:22 +02:00
unknown
ed3f472a12
Fix for Bug#3357 "If the statement is long, the error message is trunc and important info is lost";
...
in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning,
so that it is not cut by truncation if the query is very long (which happens if the query goes first).
sql/log_event.cc:
in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning,
so that it is not cut by truncation if the query is very long (which happens if the query goes first).
2004-05-04 15:48:40 +02:00
unknown
7e41bc959c
don't rely on readdir() returning . and .. first
2004-05-04 14:36:23 +02:00
unknown
3a4d315fa1
fixed db name and layout (can cause very rare race condition bug)
2004-05-04 13:07:36 +03:00
unknown
f543ca9149
compatibility fix. warning removed
2004-05-03 18:26:50 +02:00
unknown
c98791c7da
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
unknown
d3f1288044
better followup fix for my_getopt (Argh!)
2004-04-30 23:12:37 +02:00
unknown
1175b48555
followup - error fixed
2004-04-30 22:52:08 +02:00
unknown
d5c22bf331
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-04-30 19:18:36 +02:00
unknown
136621525d
--ft-stopword-file option for myisamchk
2004-04-30 19:17:55 +02:00
unknown
63e75e7b85
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-04-30 00:15:39 +03:00
unknown
f4b02f9937
Portability fixes
...
mysql-test/mysql-test-run.sh:
Avoid 'too many arguments' error
mysql-test/t/system_mysql_db_fix-master.opt:
Add missing newline
scripts/mysql_fix_privilege_tables.sh:
Portability fix
2004-04-30 00:14:56 +03:00
unknown
0c661e2c60
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-04-29 19:46:01 +02:00
unknown
3594adb165
InnoDB: implement LOCK TABLE (Bug #3299 )
...
innobase/include/lock0lock.h:
Add lock_table_unlock() and lock_release_tables_off_kernel()
Add LOCK_TABLE_EXP
innobase/include/row0mysql.h:
Add row_unlock_table_for_mysql() and row_lock_table_for_mysql()
innobase/include/trx0trx.h:
Add n_tables_locked
innobase/lock/lock0lock.c:
Add LOCK_TABLE_EXP for explicit LOCK TABLE commands
Add lock_table_unlock()
Add lock_release_tables_off_kernel()
innobase/row/row0mysql.c:
Add row_unlock_table_for_mysql() and row_lock_table_for_mysql()
innobase/trx/trx0trx.c:
Add n_tables_locked
mysql-test/r/innodb.result:
Updated handling of auto_inc columns
sql/ha_innodb.cc:
Call row_lock_table_for_mysql() and row_unlock_table_for_mysql()
2004-04-29 16:42:33 +03:00
unknown
4048fe5c30
- 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
unknown
b7468a97a2
Portability fix (for AIX)
...
innobase/pars/lexyy.c:
Add missing include file (Needed for AIX)
2004-04-29 13:18:20 +03:00
unknown
c008eb0425
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-04-28 23:46:16 +02:00
unknown
2a5d6bdc39
Very small fixes for testsuite (a real_sleep instead of sleep, plus TCP port independency of the result file).
...
mysql-test/r/rpl_server_id1.result:
be port-independent
mysql-test/r/rpl_server_id2.result:
be port-independent
mysql-test/t/rpl_error_ignored_table.test:
we want to sleep 2 secs, not more; if we allow ourselves to sleep >=10 seconds, then
the get_lock() will be aborted and we will arrive to late for the KILL to have
the desired effect of generating an error code in the binlog.
mysql-test/t/rpl_server_id1.test:
be port-independent
mysql-test/t/rpl_server_id2.test:
be port-independent
2004-04-28 23:43:46 +02:00
unknown
d30a350d7a
my-medium.cnf.sh:
...
Correct typo, and fix up rest of sentence as well.
support-files/my-medium.cnf.sh:
Correct typo, and fix up rest of sentence as well.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
2004-04-28 11:50:32 -05:00