Commit graph

2770 commits

Author SHA1 Message Date
unknown
32208e0255 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-12 17:23:23 +02:00
unknown
ce194f04c5 Fix for a bug with column privileges ... 2003-03-12 17:08:48 +02:00
unknown
f16873ec9a Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-03-12 16:43:37 +02:00
unknown
72f44dafe6 NEWDATE -> DATE in anylyse() output
Changed that analyse(#) also affects strings


mysql-test/r/analyse.result:
  Better analyse test
mysql-test/t/analyse.test:
  Better analyse test
sql/sql_analyse.cc:
  NEWDATE -> DATE in anylyse() output
  Changed that analyse(#) also affects strings
  Fixed that number of elements in ENUM is limited by # not by #+1
2003-03-12 16:43:01 +02:00
unknown
ddd2f4fc3e - Fixed man page for apropos/whatis (thanks to Christian Hammers from Debian
for the patch) (bug )
2003-03-11 22:47:29 +01:00
unknown
b0a3c1c905 Merge sanja.is.com.ua:/home/bell/mysql/mysql-3.23
into sanja.is.com.ua:/home/bell/mysql/work-rand-3.23
2003-03-11 22:38:32 +02:00
unknown
8218d49dce Merge bk-internal:/home/bk/mysql-3.23/
into serg.mysql.com:/usr/home/serg/Abk/mysql
2003-03-11 21:21:11 +01:00
unknown
dccac58396 fixed an obscure bug in group by + having + Item_ref::get_date 2003-03-11 21:20:53 +01:00
unknown
d69a5630ff Cleaned up disk_pos_assert() to be more general. 2003-03-11 21:25:17 +02:00
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
8162aec6b9 fixed bug of unchecked random part of WHERE clause (bug )
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
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
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
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
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
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
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
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
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
f5144a8a56 A correct fix for the timeout problem 2003-03-08 19:35:44 +02:00
unknown
157b36675e Fixed an unlikely optimizer bug that casued a core dump in pt_range.cc::sel_cmp()
mysql-test/r/join.result:
  Test of range optimizer bug
mysql-test/t/join.test:
  Test of range optimizer bug
sql/sql_rename.cc:
  Added missing DEBUG_PRINT()
2003-03-07 14:40:37 +02:00
unknown
5861dc5b8b Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql


sql/mysql_priv.h:
  Auto merged
2003-03-05 15:45:11 +02:00
unknown
a300406b4f A better, but larger fix for server_id bug .. 2003-03-05 15:34:58 +02:00
unknown
4016096bac Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2003-03-04 18:03:11 +01:00
unknown
8529b744b7 fixed Field::eq() to work with CHAR(0) fields
BitKeeper/etc/ignore:
  Added configure.lineno innobase/configure.lineno to the ignore list
2003-03-04 18:02:56 +01:00
unknown
5247c5bf51 Fix for SHOW VARIABLES on 64-bit platforms 2003-03-04 18:23:15 +02:00
unknown
374ea106f5 Fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another
sql/lock.cc:
  Added functions to handle list of table name locks
sql/mysql_priv.h:
  Added functions to handle list of named locks
sql/sql_rename.cc:
  Use new general table name lock functions
sql/sql_table.cc:
  Require table name locks when doing drop table.
  This fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another
2003-03-03 20:42:49 +02:00
unknown
8aff7ae9a6 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-03 17:16:09 +02:00
unknown
391bc11a21 Always include errno.h
include/global.h:
  Portability fix
  (Using errno before including errno.h can give big problems on Linux)
2003-02-28 19:52:14 +02:00
unknown
40fbd0fc79 LOAD DATA INFILE is not replicated by slave if replicate_*_table is set 2003-02-28 19:50:05 +02:00
unknown
41e10e728e Added copying of *.slave-mi mysql-test files 2003-02-28 12:32:37 +02:00
unknown
23a850e5a6 Fix for SHOW TABLE STATUS with empty .frm file 2003-02-26 10:16:50 +02:00
unknown
85d6d3d8ec Comment column in SHOW TABLE STATUS now reports that it can
contain NULL values (which is the case for a crashed .frm file).
2003-02-26 09:52:19 +02:00
unknown
21f2382b28 change 'slave-master-info.opt' to .slave-mi to avoid problems with long filenames on some OS
mysql-test/t/rpl_rotate_logs.slave-mi:
  Rename: mysql-test/t/rpl_rotate_logs-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs.slave-mi
mysql-test/t/rpl000015.slave-mi:
  Rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi
2003-02-26 00:04:13 +02:00
unknown
469c998b75 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql


sql/share/polish/errmsg.txt:
  Auto merged
2003-02-25 16:09:47 +02:00
unknown
0d3b0c3950 Fixed "syntax" errors in text message files.
Ensured that all errors messages ends with: ",


sql/share/czech/errmsg.txt:
  Fixed new line terminations
sql/share/danish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/dutch/errmsg.txt:
  Fixed "syntax" errors.
sql/share/english/errmsg.txt:
  Fixed "syntax" errors.
sql/share/estonian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/french/errmsg.txt:
  Fixed "syntax" errors.
sql/share/german/errmsg.txt:
  Fixed "syntax" errors.
sql/share/greek/errmsg.txt:
  Fixed "syntax" errors.
sql/share/hungarian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/italian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/japanese/errmsg.txt:
  Fixed "syntax" errors.
sql/share/korean/errmsg.txt:
  Fixed "syntax" errors.
sql/share/norwegian-ny/errmsg.txt:
  Fixed "syntax" errors.
sql/share/norwegian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/polish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/portuguese/errmsg.txt:
  Fixed "syntax" errors.
sql/share/romanian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/russian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/slovak/errmsg.txt:
  Fixed "syntax" errors.
sql/share/spanish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/swedish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/ukrainian/errmsg.txt:
  Fixed "syntax" errors.
2003-02-25 13:41:08 +02:00
unknown
cf417ede65 Indentation cleanup 2003-02-25 11:05:07 +02:00
unknown
283a8a16f6 ibuf0ibuf.c:
Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records


innobase/ibuf/ibuf0ibuf.c:
  Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records
2003-02-21 23:11:31 +02:00
unknown
ed47a1da5c Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-02-21 16:23:44 +02:00