Commit graph

9599 commits

Author SHA1 Message Date
unknown
b2a6994b22 Fix for a bug .
Happens when braces are used on a single select, which leads
to the uninitialized global parameters structure.
2003-09-09 15:23:38 +03:00
unknown
d17cfa9caa removing additional IN subquery condition
fixed IN optimisation bug


mysql-test/r/subselect.result:
  test of IN optimisation bug
mysql-test/t/subselect.test:
  test of IN optimisation bug
sql/item_subselect.cc:
  fixed IN optimisation bug
sql/mysql_priv.h:
  constant for additional IN subquery condition detecting
sql/mysqld.cc:
  constant for additional IN subquery condition detecting
sql/sql_select.cc:
  removing additional IN subquery condition
2003-09-08 21:58:09 +03:00
unknown
13f0dc32f4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2003-09-08 21:47:41 +05:00
unknown
d8f676f543 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
2003-09-08 12:47:40 -04:00
unknown
82afcf7eb0 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0
2003-09-08 12:46:16 -04:00
unknown
f03afbf289 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0
2003-09-08 12:16:17 -04:00
unknown
0c5145ccd9 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0


client/mysqldump.c:
  Auto merged
2003-09-08 12:15:17 -04:00
unknown
d2008574d6 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-09-08 17:48:00 +02:00
unknown
cccb195baa Merge
innobase/row/row0sel.c:
  SCCS merged
2003-09-08 16:55:30 +02:00
unknown
b036ffec6c fix for
libmysqld/lib_sql.cc:
  we need ER() macrodefinition from errmsg.h
2003-09-08 18:49:23 +05:00
unknown
1d3d64d69b Fix for the bug : SELECT DATABASE(). 2003-09-08 17:30:53 +05:00
unknown
be67ce0b0f fix for
sql/sql_parse.cc:
  This line fails in libmysqld.
  And isn't needed while we don't check privileges in embedded library
2003-09-08 17:00:39 +05:00
unknown
9fd076375b Trimming of embedded library code
sql/sql_parse.cc:
  It's better to check for HAVE_REPLICATION here instead of EMBEDDED_LIBRARY
2003-09-08 15:08:53 +05:00
unknown
8aff7009fd fix for
sql/sql_parse.cc:
  Replication's commands were allowed, but didn't have proper implementations
  for embedded library
2003-09-08 14:46:44 +05:00
unknown
ca2ab3537c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-09-08 14:43:54 +05:00
unknown
f94972f66d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-09-08 13:13:17 +05:00
unknown
d0f9e73a43 fix for
include/errmsg.h:
  Error code added
libmysql/errmsg.c:
  Error message added
libmysqld/lib_sql.cc:
  static inited variable changed to global server_inited
libmysqld/libmysqld.c:
  check for mysql_server_init execution added
2003-09-08 13:11:18 +05:00
unknown
2a5b413ab1 Fix for
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 : 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 (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 )


client/mysqldump.c:
  added space after first '--' in the long '----....' comment line
  just to make it compatible with the manual
  (fixed bug )
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 )
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 , 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 - 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