Commit graph

10194 commits

Author SHA1 Message Date
unknown
d8d642314c Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug


sql/sql_parse.cc:
  Auto merged
2003-10-24 23:53:53 +02:00
unknown
ea47b72d15 removed one more hack that - as usual - almost always worked
(but broke permission handling for *some* IP's after we started to compare in utf8)
Bug #1636
2003-10-24 23:27:21 +02:00
unknown
800f2f46d1 added quotas for database names
(fixed bug #1348)


client/mysqldump.c:
  added quotas for database names
2003-10-24 17:26:26 -04:00
unknown
4e5f086b59 fixes to Bitmap class 2003-10-24 22:44:48 +02:00
unknown
ddd5eebd1e added to mysql_secure_installation
changing root password on all hosts (bug 1228)


scripts/mysql_secure_installation.sh:
  added changing root password on all hosts
2003-10-24 15:20:46 -04:00
unknown
f38d78943c after merge fix 2003-10-24 21:14:26 +03:00
unknown
1ba35900d6 made 'TODO' 2003-10-24 20:09:57 +03:00
unknown
1f32eb5f18 Merge
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2003-10-24 19:42:39 +03:00
unknown
4ed1b23cd5 added comment 2003-10-24 19:30:47 +03:00
unknown
ce2c46ddd6 support 'parallel' updates and rallback of whole statement in case of error in evalueting value which should be assigned
(BUG#1484)


mysql-test/r/variables.result:
  test of swaping variables
mysql-test/t/variables.test:
  test of swaping variables
sql/item_func.cc:
  new method of user variables to pre-fetch value
sql/item_func.h:
  new method of user variables to pre-fetch value
sql/set_var.cc:
  check() methods fetch & store value
sql/set_var.h:
  check() methods fetch & store value
2003-10-24 17:28:32 +03:00
unknown
6b516a37ab style fixes 2003-10-24 13:23:06 +02:00
unknown
e05ea7b8ea Move the pid file testing after arguments are parsed (previous patch was not correct) 2003-10-24 14:22:54 +03:00
unknown
21f9a3a8ac ftbench fixes
myisam/ftbench/Ecompare.pl:
  bug in multi-column comparison fixed
myisam/ftbench/Ereport.pl:
  bug fixed
  report at 0, 0.5, 1
myisam/ftbench/README:
  updated
myisam/ftbench/ft-test-run.sh:
  various fixes
2003-10-23 23:33:06 +02:00
unknown
08236417fe Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2003-10-23 23:11:33 +02:00
unknown
e5386bcb6b added check of cardinality to IN/ALL/ANY subquery transformer
(BUG#1638)


mysql-test/r/subselect.result:
  test for BUG#1638
mysql-test/t/subselect.test:
  test for BUG#1638
sql/item_subselect.cc:
  always check cardinality first
2003-10-23 23:54:21 +03:00
unknown
5ee2807c49 Merge
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2003-10-23 23:06:43 +03:00
unknown
fdc78a7639 Merge
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2003-10-23 21:26:06 +03:00
unknown
e94666f8e7 Merge
sql/item.cc:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2003-10-23 21:09:40 +03:00
unknown
d3d001fd02 ufter review fix (BUG#1444)
sql/item.cc:
  used variable to avoid using prev_unit->item which should be more clean
sql/item_subselect.cc:
  uncachable tested on fix fields and correct bits set
2003-10-23 20:50:53 +03:00
unknown
0d97f0abe4 Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0
2003-10-23 15:29:29 +02:00
unknown
375f951476 Put username in the Subject line as well (with the changeset number). 2003-10-23 15:24:48 +02:00
unknown
aa98f58bae query expansion for fulltext search
myisam/ft_boolean_search.c:
  assert.h and queues.h moved to ftdefs.h
myisam/ft_parser.c:
  ft_parse() with alloc
myisam/ft_static.c:
  api changes, ft_max_word_len_for_sort variable removed
myisam/ft_update.c:
  ft_parse() with alloc
myisam/ftdefs.h:
  variable ft_max_word_len_for_sort -> define FT_MAX_WORD_LEN_FOR_SORT
  api changes, ft_max_word_len_for_sort variable removed
  ft_parse() with alloc
myisam/mi_check.c:
  variable ft_max_word_len_for_sort -> define FT_MAX_WORD_LEN_FOR_SORT
myisam/myisamchk.c:
  ft_max_word_len_for_sort removed
mysql-test/r/fulltext.result:
  query expansion tests
mysql-test/r/fulltext_var.result:
  ft_max_word_len_for_sort removed
mysql-test/t/fulltext.test:
  query expansion tests
sql/ha_myisam.h:
  ft api changes for query expansion
sql/mysqld.cc:
  ft_max_word_len_for_sort removed
  ft_query_expansion_limit added
sql/set_var.cc:
  ft_max_word_len_for_sort removed
  ft_query_expansion_limit added
sql/sql_yacc.yy:
  EXPANSION added to keyword: rule
2003-10-23 15:21:06 +02:00
unknown
f1a9ebe932 Fix results after merge 2003-10-23 14:04:06 +03:00
unknown
f90558d645 Merge with 3.23 to get 4.0 tree in sync (no relevant changes to 4.0 tree)
BitKeeper/etc/logging_ok:
  auto-union
sql/mini_client.cc:
  Auto merged
client/mysqlbinlog.cc:
  use local file
mysql-test/t/myisam.test:
  Remove uncessesary drop table
sql/sql_parse.cc:
  Use local
sql/sql_repl.cc:
  use local
2003-10-23 13:25:16 +03:00
unknown
cd9b28f0dc Don't use atomic add for not critical statistics. 2003-10-23 13:07:13 +03:00
unknown
47f3a4fd4a Merge
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
2003-10-22 20:52:47 +03:00
unknown
a6aeb62749 Reverted a wrong patch from mysqlhotcopy. This is a real bug
in MySQL server...
2003-10-22 19:24:19 +03:00
unknown
fd85cc84e4 MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax
myisam/mi_write.c:
  cleanup
mysql-test/t/fulltext.test:
  after merge fix
2003-10-22 17:57:09 +02:00
unknown
3fdca01f24 Fixed a bug in mysqlhotcopy, which made special table names
to cause program to abort. Such table name could have been
one with a semicolon (:) in the middle.
2003-10-22 18:40:37 +03:00
unknown
cbc5304742 Fixed bug #954 mysqlhotcopy permission problem. The database
directory owner ship was not honored.
2003-10-22 18:19:59 +03:00
unknown
15988a374d Applied a patch from Travis Wheeler to mysqlhotcopy that allows
using regexp with tablenames together with databasenames.
2003-10-22 16:02:27 +03:00
unknown
033a038296 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.pass
2003-10-22 15:38:20 +05:00
unknown
061cbf8734 ftbench fixes 2003-10-21 23:44:26 +02:00
unknown
eb0acc2996 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-10-21 20:26:28 +02:00
unknown
50baee8c0b - bumped up version number in configure.in to to 4.0.17 now that
4.0.16 has been tagged and released
 - tagged ChangeSet 1.1576.1.5 as "mysql-4.0.16"


configure.in:
   - bumped up version number to 4.0.17 now that 4.0.16 has been tagged
     and released
2003-10-21 18:41:19 +02:00
unknown
77c89711d2 Bug#1271 - RAND_TABLE_BIT in expression and only const_tables in join 2003-10-21 17:34:40 +02:00
unknown
9a4aa99769 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2003-10-21 16:06:26 +05:00
unknown
8d94e500e0 Fix for Windows bug reported throuhg Miguel
libmysqld/lib_sql.cc:
  This code seems to be superfluous
sql/derror.cc:
  in embedded server these functions should return the sign of the error
  instead of halting the program
sql/init.cc:
  my_abort_hook left unchanged
sql/mysql_priv.h:
  declaration of init_errmessage changed
  unireg_abort was replaced with DBUG_RETURN for embedded server
sql/mysqld.cc:
  these functions don't work in embedded server thus #ifdef-ed
2003-10-21 16:05:17 +05:00
unknown
e0fd80f72a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0


mysql-test/r/rpl_trunc_binlog.result:
  Auto merged
2003-10-21 12:24:32 +02:00
unknown
3e937ef4e2 Fix for Bug #1595 "mysqlbinlog can't read a password from the console".
** I already fixed it in 3.23; I fix it in 4.0 separately because the
code is a bit different (so the changeset 1.1422 of 3.23 should not be
merged here) **
Make mysqlbinlog prompt for the password if
mysqlbinlog -p
instead of printing the usage().
This makes mysqlbinlog behave like other clients.
This new code was almost copied from mysqldump.
Note that before, one could use
  mysqlbinlog -p pass
and now one must use
  mysqlbinlog -ppass
(putting a space will ask for the password).


client/mysqlbinlog.cc:
  Make mysqlbinlog prompt for the password if
  mysqlbinlog -p
  instead of printing the usage().
  This makes mysqlbinlog behave like other clients.
  This new code was almost copied from mysqldump.
  Note that before, one could use
    mysqlbinlog -p pass
  and now one must use
    mysqlbinlog -ppass
  (putting a space will ask for the password).
2003-10-21 12:22:24 +02:00
unknown
42de9a3ed9 Fix for bug #1271: Undefined variable in PASSWORD() function is not
handled correctly
2003-10-21 15:14:06 +05:00
unknown
f3e174cac5 after-merge fix 2003-10-21 12:00:34 +02:00
unknown
954264b19e merged
BitKeeper/etc/ignore:
  auto-union
include/m_ctype.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
strings/ctype-simple.c:
  Auto merged
2003-10-21 11:58:43 +02:00
unknown
572e18aeb3 >255 keys support in frm 2003-10-21 00:13:17 +02:00
unknown
293a61ed35 oops forgot to commit ft_parser.c :-[]
myisam/ft_parser.c:
  oops forgot to commit this file :-[]
2003-10-20 21:32:49 +02:00
unknown
8c2d17c777 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-count-4.1


sql/item.cc:
  Auto merged
2003-10-20 18:18:18 +03:00
unknown
5d4ae98711 Test for bug #1022
Description: When a table contains a 'float' field, and one of the functions
MAX, MIN, or AVG is used on that field, the system crashes.
2003-10-20 19:13:45 +05:00
unknown
fbc376e391 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/item.cc:
  Auto merged
2003-10-20 18:53:58 +05:00
unknown
228f4a43a3 FULLTEXT: correct charset support (UTF included, UCS2 - not)
code cleanup


include/m_ctype.h:
  my_mbcharlen_8bit() { return 1 }
mysql-test/r/fulltext.result:
  fulltext on UTF
mysql-test/t/fulltext.test:
  fulltext on UTF
sql/item_cmpfunc.h:
  cleanup
sql/sql_table.cc:
  FULLTEXT: UCS2 is not allowed
sql/sql_yacc.yy:
  FULLTEXT: code cleanup
strings/ctype-bin.c:
  my_mbcharlen_8bit() { return 1 }
strings/ctype-latin1.c:
  my_mbcharlen_8bit() { return 1 }
strings/ctype-simple.c:
  my_mbcharlen_8bit() { return 1 }
strings/ctype-tis620.c:
  my_mbcharlen_8bit() { return 1 }
strings/ctype-utf8.c:
  hack: (to be fixed properly later) all multi-byte sequences are considered isalpha() now
2003-10-20 15:53:48 +02:00
unknown
30743b9665 Fix for:
http://bugs.mysql.com/bug.php?id=1022
Description: When a table contains a 'float' field, and one of the functions
MAX, MIN, or AVG is used on that field, the system crashes.
2003-10-20 18:52:45 +05:00