Commit graph

7635 commits

Author SHA1 Message Date
unknown
1ef58971fd Reword comment/help message.
Fix comment typos. (Skipp -> Skip)
2004-03-09 11:48:32 -06:00
unknown
32ba57b814 mysqldump.c:
This is to fix mysqldump problem when local-infile option is present under [client] options header.  It will not start. This must be fixed as other programs use that option under [client] options header.


client/mysqldump.c:
  This is to fix mysqldump problem when local-infile option is present under [client] options header.  It will not start. This must be fixed as other programs use that option under [client] options header.
2004-03-09 17:00:00 +02:00
unknown
65cc7890a4 Touch up error message. 2004-03-08 15:58:45 -06:00
unknown
1ae04e9154 Patch for #3068: [Prompt without seconds when set from INI file].
(Fix hours/seconds always to display with two digits.)
2004-03-08 15:52:06 -06:00
unknown
4c2dd901c9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-08 14:47:49 +01:00
unknown
d44d6976d0 Fix for BUG#3081 "if an INSERT DELAYED is killed, it is binlogged as killed but it's not needed".
INSERT DELAYED works only for one-row inserts (in latest 4.0 versions
at least). So killing a delayed_insert thread does not spoil replication:
the rows which actually went into the table are exactly those listed
in the binlog. So when the delayed_insert thread is killed, don't log
it as 'killed', because it causes superfluous stops on the slave.


sql/log_event.cc:
  INSERT DELAYED works only for one-row inserts (in latest 4.0 versions
  at least). So killing a delayed_insert thread does not spoil replication:
  the rows which actually went into the table are exactly those listed
  in the binlog. So when the delayed_insert thread is killed, don't log
  it as 'killed', because it causes superfluous stops on the slave.
2004-03-08 14:47:13 +01:00
unknown
5bc89a9644 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2004-03-06 10:43:53 +02:00
unknown
aa20bd9e8c Ensure that one can't from the command line set a variable too small. (Bug #2710)
Allow one to force lower_case_table_names to 0, even if the file system is case insensitive. This fixes some issues on Mac OS X (Bug #2994)
Added variables "lower_case_file_system", "version_compile_os" and "license"


mysql-test/t/lowercase_table3-master.opt:
  Rename: mysql-test/t/lowercase_table2-master.opt -> mysql-test/t/lowercase_table3-master.opt
mysys/my_getopt.c:
  Ensure that one can't from the command line set a variable too small (could happen when sub_size was set)
sql/mysql_priv.h:
  Added lower_case_file_system
sql/mysqld.cc:
  Allow one to force lower_case_table_names to 0, even if the file system is case insensitive
sql/set_var.cc:
  Added variable "lower_case_file_system"
  Added variable "version_compile_os"
  Added variable "license"
sql/set_var.h:
  Added support for read only strings
sql/sql_select.cc:
  Make join optimizer killable
2004-03-06 10:43:35 +02:00
unknown
8550c7abeb fixed Bug #2985
"Table truncated when creating another table name with Spaces"
added to check_db_name, check_table_name and check_column_name
test for end space


mysql-test/r/create.result:
  added test for Bug #2985 
   "Table truncated when creating another table name with Spaces"
mysql-test/t/create.test:
  added test for Bug #2985 
   "Table truncated when creating another table name with Spaces"
sql/sql_db.cc:
  cancel strip end spaces for database name
sql/sql_parse.cc:
  cancel strip end spaces for database name
sql/table.cc:
  added to check_db_name, check_table_name and check_column_name 
  test for end space
2004-03-05 22:13:33 +04:00
unknown
c0422729cf Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2004-03-04 20:30:29 +02:00
unknown
21918cf763 Added option chroot to mysqlhotcopy.
Useful in case mysqld was started with chroot.
2004-03-04 18:30:28 +00:00
unknown
bc9de3d455 fixed Bug #3051 "FLOOR returns invalid"
mysql-test/r/func_math.result:
  added test for Bug #3051 "FLOOR returns invalid"
mysql-test/t/func_math.test:
  added test for Bug #3051 "FLOOR returns invalid"
2004-03-04 22:11:33 +04:00
unknown
c890c31226 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.0
2004-03-04 17:58:59 +00:00
unknown
52236ae1e1 Fixed Bug#2491, INSERT DELAYED causes binary log unusable by mysqlbinlog (replication is ok)
Setting insert delayed threads = 0 at mysql_init_command.


sql/mysql_priv.h:
  New session variable, max_insert_delayed_threads
sql/mysqld.cc:
  New session variable, max_insert_delayed_threads
sql/set_var.cc:
  New session variable, max_insert_delayed_threads
sql/sql_class.h:
  New session variable, max_insert_delayed_threads
sql/sql_insert.cc:
  New session variable, max_insert_delayed_threads
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-03-04 17:58:36 +00:00
unknown
d4f43e511c invalidation of locking for write tables (BUG#2693)
fixed linking query_prealloc_size to query cache presence


mysql-test/r/query_cache.result:
  test of QC invalidation by LOCK command
mysql-test/t/query_cache.test:
  test of QC invalidation by LOCK command
sql/mysqld.cc:
  new variable query_cache_wlock_invalidate
  fixed query_prealloc_size with QC absence
sql/set_var.cc:
  new variable query_cache_wlock_invalidate
sql/sql_cache.cc:
  new method for table invalidation
sql/sql_cache.h:
  new method for table invalidation
sql/sql_class.h:
  new variable query_cache_wlock_invalidate
sql/sql_parse.cc:
  layout fixed
2004-03-04 18:32:55 +02:00
unknown
0b751edc57 Rollback UPDATE/DELETE statements on kill
nsure that rows in a multi-row INSERT DELAYED are inserted atomicly


mysql-test/mysql-test-run.sh:
  Make test case safe for openserver/unixware (Bug #2700)
sql/sql_delete.cc:
  Rollback statement on kill
sql/sql_insert.cc:
  Ensure that rows in a multi-row INSERT DELAYED are inserted atomicly (without releasing logs).
  This is needed to ensure that the mysqlbinlog is consistent.
  Bug #2491
sql/sql_list.h:
  Ensure that rows in a multi-row INSERT DELAYED is inserted atomicly (without releasing logs).
  This is needed to ensure that the mysqlbinlog is consistent.
  Bug #2491
sql/sql_update.cc:
  Rollback statement on kill
2004-03-04 18:16:10 +02:00
unknown
eadfe4ddfa Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-04 15:45:03 +01:00
unknown
c1f9f3b601 Fix for BUG#3063 "Don't mark an auto DROP TEMP TABLE as 'killed' in the binlog";
even if the thread was killed, we write the DROP with error_code=0.
This will remove unneeded stops on slave, and will lose nothing:
if a real update was killed, this real update will be logged with the
nonzero error code and will cause the stop on slave.
2004-03-04 15:44:24 +01:00
unknown
53368efea3 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-04 14:48:28 +01:00
unknown
4924f276db drop tables in windows-compatible order 2004-03-04 14:47:33 +01:00
unknown
b60519406e 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


innobase/srv/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
unknown
58d7de6e04 Indented comment properly 2004-03-04 10:57:30 +02:00
unknown
e9bb2b40c1 WL#1510: "Implement support for "commercial" binaries on handshake":
- server-side variable 'license' added
2004-03-02 16:01:50 +03:00
unknown
15d8e9d064 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-01 15:17:06 +01:00
unknown
12ede13a97 Fix for BUG#3015
"(binlog, position) stored by InnoDB for a replication slave can be wrong".
This code contains conditional #if to distinguish between versions;
it should be merged into 4.1 and 5.0.


sql/ha_innodb.cc:
  correcting the binlog position stored in InnoDB in a slave.
sql/log_event.cc:
  better code to store the binlog position in InnoDB for a slave.
sql/slave.h:
  Better code for storing the binlog position in InnoDB for a slave.
2004-03-01 15:15:58 +01:00
unknown
1c44237c0e Merge ubayer@bk-internal.mysql.com:/home/bk/mysql-4.0
into morbus.(none):/home/ulli/work/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2004-03-01 11:24:10 +01:00
unknown
bf53c87049 Fix for BUG#3017
"wrong Relay_Log_Pos if Rotate is in the middle of a transaction in relay log"
increment 'pending' instead of 'relay_log_pos'.


mysql-test/r/rpl_trunc_binlog.result:
  result update
sql/log_event.cc:
  - corrected error message
  - in Rotate_log_event::exec_event(), if we're in a transaction (which
  can happen if the I/O slave thread reconnected while reading a
  transaction), don't increment relay_log_pos but pending instead.
  Otherwise, relay_log_pos becomes garbage (and so if slave stops at that
  moment, it will never restart).
2004-03-01 00:46:31 +01:00
unknown
343680f46e Fix problem with NT named pipes code (per e-mail thread).
sql/mysqld.cc:
  Should be mysql_unix_port (cut and paste error).
2004-02-28 15:11:16 +01:00
unknown
588b8b9310 Changes to fix errors encountered in test builds on Windows.
VC++Files/innobase/innobase.dsp:
  odbc0odbc.c was removed from the tree.
VC++Files/libmysql/libmysql.dsp:
  strxnmov.c is needed in this module.
sql/log_event.cc:
  Cast required to resolve compile error on Windows - byte * is 
  not equivalent to char *.
sql/opt_range.cc:
  Cast to const char * required to resolve compile error on Windows.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-02-27 16:51:01 +01:00
unknown
d32e12b253 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


innobase/row/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
unknown
cae2503b0b fix for bug #2905 -
"mysqladmin.c & co fail to use MYSQL_PORT as the default value of the TCP/IP port"


client/mysqladmin.c:
  changed the value after REQUIRED_ARG from 0 to MYSQL_PORT
client/mysqltest.c:
  changed the value after REQUIRED_ARG from 0 to MYSQL_PORT
client/thread_test.c:
  changed the value after REQUIRED_ARG from 0 to MYSQL_PORT
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-02-26 19:09:49 +01:00
unknown
e0618ae4ae do not look for string characters "'` inside comments - bug#539 2004-02-26 01:05:04 +01:00
unknown
f3b4f760f6 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
unknown
22e1491188 trx0undo.c:
Removed bogus assertion


innobase/trx/trx0undo.c:
  Removed bogus assertion
2004-02-25 12:44:53 +02:00
unknown
1fbad3c0d2 Inserted comment about lost root pwd procedure in Docs relying on command order in mysqladmin.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-02-25 09:46:43 +10:00
unknown
4e8d56654c Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-02-24 23:10:13 +01:00
unknown
53660c6f5b --set-character-set and --character-sets-dir in myisamchk now work 2004-02-24 23:07:45 +01:00
unknown
7b185bb436 ha_innodb.cc:
Add diagnostic code to analyze an assertion failure in ha_innodb.cc on line 2020 reported by a user (Bug #2903)


sql/ha_innodb.cc:
  Add diagnostic code to analyze an assertion failure in ha_innodb.cc on line 2020 reported by a user (Bug #2903)
2004-02-24 17:38:47 +02:00
unknown
c72a9e7ede ut0dbg.h:
If there is an assertion failur refer the user to section 6.1 of the InnoDB online manual about forcing recovery


innobase/include/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
unknown
dd8adcc89b A fix for double free of memory in mysqlbinlog. 2004-02-23 14:02:32 +02:00
unknown
1ef4295600 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
unknown
dcb196741f configure.in:
Removed the unused odbc directory


innobase/configure.in:
  Removed the unused odbc directory
2004-02-23 12:33:43 +02:00
unknown
9aecd2044e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-02-22 11:30:58 +01:00
unknown
a61331d805 Complement to
ChangeSet 1.1616.23.1
Fix for BUG#1858 "SQL-Thread stops working when using optimize table".
A test for this.


sql/sql_base.cc:
  In remove_table_from_cache(), kill only delayed threads.
2004-02-22 11:22:51 +01:00
unknown
16874ede63 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2004-02-22 10:52:43 +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
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
d8f1d154a4 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-02-22 00:20:09 +01:00
unknown
7759360dca ftb +(+(many -parens)) bug fixed 2004-02-22 00:19:36 +01: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