Commit graph

7662 commits

Author SHA1 Message Date
unknown
564a134ced Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-11 20:09:49 +02:00
unknown
7f7e7220c2 - made test for multiple --user options more sh-compatible 2003-03-11 18:54:57 +01:00
unknown
fd59fb1031 A bug fix for multi-table updates with InnoDB storage engine 2003-03-11 19:40:49 +02:00
unknown
8162aec6b9 fixed bug of unchecked random part of WHERE clause (bug #142)
mysql-test/r/select.result:
  test of random WHERE clause
mysql-test/t/select.test:
  test of random WHERE clause
sql/sql_select.cc:
  fixed bug of unchecked random part of WHERE clause
2003-03-11 18:34:00 +02:00
unknown
11e0756966 - fixed C++-style comments in .c files to make IBM compiler happy
(it barfs on these with a syntax error)


sql/net_serv.cc:
   - fixed C++-style comment (this file is copied as libmysql_r/net.c)
strings/ctype-tis620.c:
   - fixed many C++-style comments
2003-03-11 15:37:31 +01:00
unknown
b65aee401c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-11 15:40:09 +02:00
unknown
7b19426648 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-11 14:42:07 +02:00
unknown
4901295af1 Conflicts relsolving
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
2003-03-11 16:32:17 +04:00
unknown
83814ef429 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


sql/item_cmpfunc.cc:
  Auto merged
2003-03-11 13:26:26 +02:00
unknown
79a6e9dcda fixed cached constsnt determination (bug #142 related)
mysql-test/r/subselect.result:
  test of constant redecing
mysql-test/t/subselect.test:
  test of constant redecing
sql/item_cmpfunc.cc:
  fixed cached constsnt determination
2003-03-11 12:43:30 +02:00
unknown
f1662f3be9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.last


BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2003-03-11 13:52:19 +04:00
unknown
92457d6e45 Added 'PURGE LOGS BEFORE' command
Added expire-logs-days option 


mysql-test/r/rpl_rotate_logs.result:
  Added test for 'PURGE LOGS BEFORE'
mysql-test/t/rpl_rotate_logs.test:
  Added test for 'PURGE LOGS BEFORE'
sql/log.cc:
  For 'Purge logs before' command
sql/mysqld.cc:
  Added 'expire-logs-days' option
sql/set_var.cc:
  Added 'expire-logs-days' option
sql/sql_class.h:
  For 'Purge logs before' command
sql/sql_parse.cc:
  Added 'expire-logs-days' option
sql/sql_yacc.yy:
  For 'Purge logs before' command
2003-03-11 13:49:06 +04:00
unknown
3ab655681c Openssl test
client/mysqltest.c:
  For openssl test
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-11 13:41:53 +04:00
unknown
0f88392dae novell40c.patch
netware/mysqld_safe.c:
  Import patch novell40c.patch
2003-03-10 18:32:38 -05:00
unknown
e704dc5ee1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2003-03-11 00:39:55 +02:00
unknown
80f6466c85 Portability fixes
cmd-line-utils/libedit/el.c:
  Portability fix
configure.in:
  Portability fix
  (Don't call AC_PROG_CC twice)
sql/mysqld.cc:
  Move stack checking to right position
2003-03-11 00:30:35 +02:00
unknown
3f68b65e65 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23


mysql-test/mysql-test-run.sh:
  Auto merged
2003-03-11 00:17:34 +02:00
unknown
f26a8b6fb8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-03-11 00:08:53 +02:00
unknown
f88ce7545d crash-me.sh:
misprint correction


sql-bench/crash-me.sh:
  misprint correction
2003-03-11 02:32:24 +05:00
unknown
fc5832de08 fixed cleanup bug
mysql-test/r/subselect.result:
  test of cleanup bug
mysql-test/t/subselect.test:
  test of cleanup bug
sql/sql_select.cc:
  fixed cleanup
2003-03-10 22:25:52 +02:00
unknown
cdb123c25b - added missing file mysql_secure_installation to server RPM subpackage
(bug #141) (please merge with 4.1 and onwards)


support-files/mysql.spec.sh:
  - added missing file mysql_secure_installation to server RPM subpackage
    (bug #141)
2003-03-10 20:21:11 +01:00
unknown
bbc8f836c0 Fix for a bug with ROW(..) <=> ROW(...) 2003-03-10 20:54:18 +02:00
unknown
312f0366bc Merge bk-internal:/home/bk/mysql-3.23/
into serg.mysql.com:/usr/home/serg/Abk/mysql
2003-03-10 16:56:06 +01:00
unknown
326a93ff7d more propection in mi_open against badly corrupted MYI headers 2003-03-10 16:48:13 +01:00
unknown
39dbf6cb9b A fix for an obvious bug in hash generating proram. 2003-03-10 17:14:01 +02:00
unknown
462a72b802 Adding tests for the fixed ORDER BY 0 bug 2003-03-10 17:07:39 +02:00
unknown
530659e8a0 A fix for privilege checking bug.
sql/sql_parse.cc:
  Fix for a privilege bug in multi-table updates.
  Seems like better fix then chec_table_access.
2003-03-10 16:58:07 +02:00
unknown
395714aa45 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


sql/item.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
2003-03-10 16:38:26 +02:00
unknown
c2ce5116f3 fixed crash on non-well-constructed reference
mysql-test/r/subselect.result:
  test of IN with error
mysql-test/t/subselect.test:
  test of IN with error
2003-03-10 16:38:06 +02:00
unknown
9bfbea6882 - typo fix for newly added error message 2003-03-10 13:41:37 +01:00
unknown
605bfe93ef warning added 2003-03-10 13:16:59 +01:00
unknown
a6ea34ee5b merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/delete.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-03-10 14:13:46 +02:00
unknown
5c100a6975 after merge fixes 2003-03-10 13:54:20 +02:00
unknown
a032dc2712 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mysql.com:/usr/home/serg/Abk/mysql
2003-03-10 12:34:05 +01:00
unknown
dc3bd0731f ignore world-writeable my.cnf's 2003-03-10 12:31:49 +01:00
unknown
012ffb5d50 Merge with 3.23 to get fixes for --user and BACKUP TABLE
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Delete: mysql-test/r/delete.result
BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysys/my_copy.c:
  Auto merged
sql/field.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge with 3.23.56
mysql-test/r/backup.result:
  merge (needs to be updated)
mysql-test/r/join.result:
  merge (needs to be updated)
mysql-test/r/type_datetime.result:
  merge (needs to be updated)
mysql-test/t/backup.test:
  merge with 3.23
scripts/mysqld_safe.sh:
  Only use first --user option
sql/ha_myisam.cc:
  Don't let BACKUP TABLE overwrite old files
sql/log_event.h:
  merge
sql/mysql_priv.h:
  merge
sql/mysqld.cc:
  Use first --user option
sql/slave.cc:
  use local version
sql/sql_repl.h:
  use local version
2003-03-10 12:48:43 +02:00
unknown
73c2d4ad49 Don't allow multiple --user options to mysqld
(First one is used)


scripts/safe_mysqld.sh:
  Don't allow multiple --user options
sql/mysqld.cc:
  Don't allow multiple --user options
2003-03-10 12:24:22 +02:00
unknown
3223245de3 Handling of log-error added in embedded server
libmysqld/lib_sql.cc:
  handling of log-error added to embedded server
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-10 14:06:21 +04:00
unknown
66e8db8241 Fix that round(0.1,1) == round(0.1,1)
sql/slave.cc:
  Fixed problem with --debug output in handle_slave
2003-03-10 12:00:19 +02:00
unknown
281ad254dc Better fix for connect timeout problem. 2003-03-10 11:50:46 +02:00
unknown
ea826f215f Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-03-10 11:23:11 +02:00
unknown
68ae365395 Don't allow BACKUP TABLE to overwrite files
Fixed memory leak when replication restarts in debug mode


include/my_sys.h:
  Added option to not overwrite files to my_copy()
mysql-test/mysql-test-run.sh:
  Fixed --ddd option
  Fixed that mysqld is restarted if there is a testname-master.sh file
mysql-test/r/backup.result:
  Update for security fix in BACKUP TABLE
mysql-test/t/backup.test:
  Update for security fix in BACKUP TABLE
mysys/my_copy.c:
  Added option to not overwrite files to my_copy()
sql/ha_myisam.cc:
  Don't allow BACKUP TABLE to overwrite files
sql/slave.cc:
  Fixed problem with --debug output from 'handle_slave'
  Fixed memory leak when replication restarts in debug mode
2003-03-10 11:22:37 +02:00
unknown
aa0f5c8e15 Merge build:/home/bk/mysql-3.23
into serg.mysql.com:/usr/home/serg/Abk/mysql
2003-03-10 00:21:21 +01:00
unknown
6c366f8d90 .del-stamp-h.in~4a5d6676232516c5:
Delete: innobase/stamp-h.in


BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5:
  Delete: innobase/stamp-h.in
2003-03-10 00:21:04 +01:00
unknown
64cf72900c Made it possible to use --max-delayed-threads=0 in order to disable
INSERT DELAYED.
2003-03-09 19:03:55 +02:00
unknown
fd5182cb74 Changed --debug to append to test instead of creating new trace files.
(This patch is already in 4.0)


mysql-test/mysql-test-run.sh:
  Changed --debug to append to test instead of creating new trace files
2003-03-09 17:13:37 +02:00
unknown
ec6bd7a49a Additional bug fix
libmysql/libmysql.c:
  Additional fix for connection being established during select()
2003-03-08 22:37:22 +02:00
unknown
249788280a Fix for a crashing bug 2003-03-08 22:19:41 +02:00
unknown
44c9a3893d Clearer error message when one forgot to grant REPLICATION SLAVE :
now we'll have something like this :
030308 18:46:58  Slave I/O thread: connected to master 'gb@localhost:3306',  replication started in log 'FIRST' at position 4
030308 18:46:58  While trying to obtain the list of slaves from the master 'localhost:3306', user 'gb' got the following error: 'Access denied. You need the REPLICATION SLAVE privilege for this operation'
030308 18:46:58  Slave I/O thread exiting, read up to log 'FIRST', position 4
instead of "Error updating slave list: Query error".
This fixes bug #80.


sql/repl_failsafe.cc:
  Clearer error message when one forgot to grant REPLICATION SLAVE
sql/repl_failsafe.h:
  Clearer error message when one forgot to grant REPLICATION SLAVE
sql/slave.cc:
  Updated for new syntax of update_slave_list
2003-03-08 18:53:32 +01:00
unknown
f5144a8a56 A correct fix for the timeout problem 2003-03-08 19:35:44 +02:00