Commit graph

9699 commits

Author SHA1 Message Date
unknown
2a5b413ab1 Fix for #1210
i fixed this in 4.1 in slightly different way


libmysqld/lib_sql.cc:
  Initialization's flag was made global
libmysqld/libmysqld.c:
  Check for mysql_server_init call added
2003-09-08 13:02:19 +05:00
unknown
2b18554744 #1169: Add --exec command to mysqltest 2003-09-08 10:53:51 +05:00
unknown
7c835f0a52 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-09-07 20:36:21 +03:00
unknown
57c9756b69 fixed row union processing
mysql-test/r/subselect.result:
  row union test
mysql-test/t/subselect.test:
  row union test
2003-09-07 20:35:10 +03:00
unknown
c9d1bdfac3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-tmp


sql/item.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2003-09-07 15:14:32 +03:00
unknown
7b107a966a fixed Bug #1184 (change type of opt_ignore_lines to longlong) 2003-09-06 18:59:04 -04:00
unknown
5193315f9d added space after first '--' in the long '----....' comment line in mysqldump
just to make it compatible with the manual
(fixed bug #1056)


client/mysqldump.c:
  added space after first '--' in the long '----....' comment line
  just to make it compatible with the manual
  (fixed bug #1056)
2003-09-06 15:06:08 -04:00
unknown
08e2747587 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-09-06 18:51:39 +05:00
unknown
1496610d1c Fix for LOAD DATA to work with embedded library
libmysqld/lib_sql.cc:
  There's now one common SCRAMBLE_LENGTH
sql/sql_load.cc:
  mysql_load fixed to work with embedded library
sql/sql_parse.cc:
  LOAD DATA enabled for embedded library
2003-09-06 18:50:30 +05:00
unknown
17c52a90cf Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-string_parameters-4.1
2003-09-06 11:43:52 +03:00
unknown
07cacdcbe7 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-09-05 17:06:36 +03:00
unknown
a65f5081ba Add QUICK as mysql-recover option in mysqld --help
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-09-05 14:44:21 +02:00
unknown
c7ef970ea5 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-05 12:05:05 +02:00
unknown
ad66d486f0 bug#926 fix undone - it caused suboptimal execution plan for "range ON, no WHERE" query
Another fix applied
2003-09-05 11:42:21 +02:00
unknown
04ff15001d after merge fixes 2003-09-05 08:16:13 +03:00
unknown
0af8b9805b Merge with 3.23 2003-09-05 06:56:28 +03:00
unknown
a91b55ce48 Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header was not updated directly after an UPDATE of split dynamic rows.
myisam/mi_locking.c:
  Added DBUG info
myisam/mi_open.c:
  Added DBUG info
myisam/mi_update.c:
  More comments
  Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header
  was not updated directly after an UPDATE of split dynamic rows.
mysql-test/r/myisam.result:
  Added test case for MyISAM UPDATE bug
mysql-test/t/myisam.test:
  Added test case for MyISAM UPDATE bug
2003-09-05 06:42:55 +03:00
unknown
a4caa4cc57 Windows fix to avoid VC++ 6.0 compiler bug, which prevents compilation when function calls are present inside an expanded inline function
innobase/fsp/fsp0fsp.c:
  Added seperate error message to avoid VC++ 6.0 compiler bug
2003-09-04 16:00:05 -04:00
unknown
3fae965102 Provide mysql_fix_privilege_tables.sql for Windows users to update grant tables (BUG #948)
Fix make_win_src_distribution


scripts/make_win_src_distribution.sh:
  Fix in case of default to .zip, use 'recode' if available
2003-09-04 12:56:02 -04:00
unknown
6f607d3aa6 Fix for bug 1176 2003-09-04 17:12:20 +05:00
unknown
d89b2a9f1d BUG
correct bug 1085 (a problem with min/max functions)
add tests of bugs 833,836,1085


mysql-test/r/func_gconcat.result:
  add tests of bugs 833, 836, 1085
mysql-test/t/func_gconcat.test:
  add tests of bugs #833, 836, 1085
sql/item_sum.cc:
  merge
sql/item_sum.h:
  correct bug 1085
2003-09-04 06:44:16 +06:00
unknown
6bd423902a merge 2003-09-04 06:13:21 +06:00
unknown
896ee227db Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2003-09-04 03:02:19 +03:00
unknown
84b296e242 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-tmp


sql/sql_parse.cc:
  Auto merged
2003-09-04 02:49:35 +03:00
unknown
f0879fd9a7 bug #1172 - crash on force index() and SEL_ARG::MAYBE_KEY 2003-09-03 22:27:04 +02:00
unknown
7efa0ee1d4 fixed bug - check_user shall not be included into the
embedded library.
2003-09-03 21:52:42 +04:00
unknown
96757dd788 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-03 19:41:01 +02:00
unknown
35af1442b6 merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
isam/open.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/handler.cc:
  Merge
sql/sql_acl.cc:
  Merge and code cleanup of acl_getroot()
2003-09-03 19:53:08 +03:00
unknown
15cb9caea6 Better quoting patch for mysqldump
client/mysqldump.c:
  Better quoting patch
2003-09-03 18:48:10 +03:00
unknown
f6daa5c358 Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into oak.local:/home/kostja/mysql/mysql-4.1-root
2003-09-03 19:28:16 +04:00
unknown
5e9e6eea1d Merge bgerber@bk-internal.mysql.com:/home/bk/mysql-4.0
into ou800.zenez.com:/unixware/home/mount/ou800/zenez3/zenez/bk/blg/mysql-4.0
2003-09-03 09:23:18 -06:00
unknown
d8572f2447 C cleanups 2003-09-03 16:31:01 +02:00
unknown
fc4c66d254 Change set for gcc patch on OpenUNIX and UnixWare SCO is the OS vendor.
configure.in:
  Changes for UnixWare 7.1.X andOpenUNIX 8.0.0 to allow gcc.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-09-03 08:07:58 -06:00
unknown
ff45893923 Monty explanation for net_store_length(uint) put to the comment 2003-09-03 18:07:00 +04:00
unknown
1ef5dce8a7 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-09-03 15:40:19 +02:00
unknown
b74332ec6b fixed after-merge bug in CHANG_USER command
sql/sql_parse.cc:
  fixed after-merge bug in CHANGE_USER command
2003-09-03 17:29:51 +04:00
unknown
15c0fe47bb Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into oak.local:/home/kostja/mysql/mysql-4.1-root


BitKeeper/etc/ignore:
  auto-union
2003-09-03 16:44:40 +04:00
unknown
d42b4eeb1d post-merge fixes
mysql-test/r/func_crypt.result:
  _dig_vec converted lowercase
sql/slave.cc:
  post-merge fix
2003-09-03 16:43:41 +04:00
unknown
90c74b360e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-string_parameters-4.1
2003-09-03 15:36:56 +03:00
unknown
49b0312dd7 merge commit, hope that none of bar and dlenev changes were
lost.


BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  merge commit: new error message added
sql-common/client.c:
  merge commit
sql/mysql_priv.h:
  merge commit: autoremerge
sql/set_var.h:
  merge commit
sql/share/czech/errmsg.txt:
  merge commit
sql/share/danish/errmsg.txt:
  merge commit
sql/share/dutch/errmsg.txt:
  merge commit
sql/share/english/errmsg.txt:
  merge commit
sql/share/estonian/errmsg.txt:
  merge commit
sql/share/french/errmsg.txt:
  merge commit
sql/share/german/errmsg.txt:
  merge commit
sql/share/greek/errmsg.txt:
  merge commit
sql/share/hungarian/errmsg.txt:
  merge commit
sql/share/italian/errmsg.txt:
  merge commit
sql/share/japanese/errmsg.txt:
  merge commit
sql/share/korean/errmsg.txt:
  merge commit
sql/share/norwegian-ny/errmsg.txt:
  merge commit
sql/share/norwegian/errmsg.txt:
  merge commit
sql/share/polish/errmsg.txt:
  merge commit
sql/share/portuguese/errmsg.txt:
  merge commit
sql/share/romanian/errmsg.txt:
  merge commit
sql/share/russian/errmsg.txt:
  merge commit
sql/share/serbian/errmsg.txt:
  merge commit
sql/share/slovak/errmsg.txt:
  merge commit
sql/share/spanish/errmsg.txt:
  merge commit
sql/share/swedish/errmsg.txt:
  merge commit
sql/share/ukrainian/errmsg.txt:
  merge commit
sql/slave.cc:
  merge commit
sql/slave.h:
  merge commit
sql/sql_acl.cc:
  merge commit
sql/sql_parse.cc:
  merge commit
sql/sql_repl.h:
  merge commit
2003-09-03 14:12:10 +04:00
unknown
cf578b265a merged
include/my_sys.h:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-09-03 12:07:18 +02:00
unknown
369ab1352a making InnoDB to return the row exactly the same (bytewise) as it was written to it 2003-09-03 11:37:59 +02:00
unknown
4a21b30e47 CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]
myisam/mi_checksum.c:
  workaround for zlib's crc32 glitch
mysql-test/r/show_check.result:
  results updated
mysys/checksum.c:
  switching to crc32 as a checksum algorithm
2003-09-03 11:34:32 +02:00
unknown
93c9f9c69f Added automatically created SSL certificates from mysql-test/std_data
to ignore list.
2003-09-03 12:19:30 +04:00
unknown
09bbb2e049 inserted forgoten ASSERT (BUG#1180)
sql/sql_prepare.cc:
  inserted forgoten ASSERT
2003-09-03 10:59:14 +03:00
unknown
2d7b489876 fixed BUG#1180 (changing WHERE clause of prepared statements by optimisation)
sql/item.h:
  constructor and method for aloning AND/OR structure of WHERE clause
sql/item_cmpfunc.cc:
  constructor and method for aloning AND/OR structure of WHERE clause
sql/item_cmpfunc.h:
  constructor and method for aloning AND/OR structure of WHERE clause
sql/item_func.cc:
  constructor for aloning AND/OR structure of WHERE clause
sql/item_func.h:
  constructor for aloning AND/OR structure of WHERE clause
sql/sql_lex.cc:
  field for saving WHERE root
sql/sql_lex.h:
  field for saving WHERE root
sql/sql_prepare.cc:
  saving WHERE root
  creating new AND/OR structure before executing prepared statement
tests/client_test.c:
  test suite for bug #1180
2003-09-02 19:56:55 +03:00
unknown
f888ceb1f0 proper obligatory quoting of identifiers in mysqldump<->server communication (unrelated from command-line options) 2003-09-02 18:30:34 +02:00
unknown
e1af4a65dc Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column. 2003-09-02 21:09:28 +05:00
unknown
d63ce665c7 fixed bug #1174 2003-09-02 12:09:27 -04:00
unknown
9de22b3637 more sanity checks for compressed files, BUG#770 2003-09-02 16:49:00 +02:00