Commit graph

28,353 commits

Author SHA1 Message Date
unknown
d9c7aaf23f Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug14723/mysql-5.0
2005-11-15 13:27:00 +01:00
unknown
f58f5bbb03 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bdb_region
2005-11-15 12:38:22 +01:00
unknown
7f3146bb5c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-15 11:05:15 +01:00
unknown
0a9badeca4 Fix bug #14816 test_if_order_by_key() expected only Item_fields.
test_if_order_by_key() expected only Item_fields to be in order->item, thus
failing to find available index on view's field, which results in reported
error.

Now test_if_order_by_key() calls order->item->real_item() to get field for
choosing index.


sql/sql_select.cc:
  Fix bug #14816 test_if_order_by_key() expected only Item_fields.
  Make test_if_order_by_key() use real_item() to get field.
mysql-test/r/view.result:
  Test case for bug#14816 test_if_order_by_key() expected only Item_fields.
mysql-test/t/view.test:
  Test case for bug#14816 test_if_order_by_key() expected only Item_fields.
2005-11-14 22:10:34 +03:00
unknown
07ddf76991 Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
After push fix. Must not access new_field if it is NULL.
2005-11-14 19:53:41 +01:00
unknown
6c708fadcb Fix bug #14850 Item_ref's null_value wasn't updated
Item_ref's null_value wasn't updated in save_org_in_field() causing reported
error.


sql/item.h:
  Fix bug #14850 Item_ref's null_value wasn't updated
  Make save_org_in_field() update Item_ref's null_value.
mysql-test/r/view.result:
  Test case for bug #14850 Item_ref's null_value wasn't updated
mysql-test/t/view.test:
   Test case for bug #14850 Item_ref's null_value wasn't updated
2005-11-14 21:52:39 +03:00
unknown
d40082448b Import patch for bug #13377 from current 5.0 bk tree.
include/my_global.h:
  Import patch 00.txt
include/my_sys.h:
  Import patch 00.txt
mysys/my_create.c:
  Import patch 00.txt
mysys/my_open.c:
  Import patch 00.txt
sql/log.cc:
  Import patch 00.txt
sql/sql_class.h:
  Import patch 00.txt
sql/sql_repl.cc:
  Import patch 00.txt
2005-11-14 18:10:16 +03:00
unknown
14637f97cd Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#14569-mysql-5.0


sql/sql_parse.cc:
  Auto merged
2005-11-14 17:42:14 +03:00
unknown
4760021e14 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug14723/mysql-5.0
2005-11-14 15:18:05 +01:00
unknown
ed419a32a9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-14 15:15:43 +01:00
unknown
bfef85a188 Added workaround for rpl_frop_db test to run on win32 properly. 2005-11-14 16:39:46 +03:00
unknown
1f7fb05c4c Added number of files into ignore list for win32 build within bk tree. 2005-11-14 16:36:05 +03:00
unknown
57a752f49b Merge selena.:H:/MYSQL/bkt/mysql-5.0-rel
into  selena.:H:/MYSQL/bkt/mysql-5.0
2005-11-14 16:16:29 +03:00
unknown
303cae4cd8 Fixes bug #13377. my_open() & my_create() functions changed to use
my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to 
allow deleting opened files. my_sopen() implementation is added to
support this functionality.


include/my_global.h:
  Fixes bug #13377. Added number of constants for share delete file
  open option.
include/my_sys.h:
  Fixes bug #13377. Added my_sopen function.
mysys/my_create.c:
  Fixes bug #13377. my_create() function changed to use my_sopen() and which allows
  to use FILE_SHARE_DELETE flag on win32, which helps in deleting opened files.
mysys/my_open.c:
  Fixes bug #13377. my_open() function changed to use my_sopen() on win32
  which allows to use FILE_SHARE_DELETE flag to allow deleting opened files.
sql/log.cc:
  Fixes bug #13377. Additional patch - remove reference counting for
  opened binlog files, introduced in initial patch of #13377.
sql/sql_class.h:
  Fixes bug #13377. Additional patch - remove reference counting for
  opened binlog files, introduced in initial patch of #13377.
sql/sql_repl.cc:
  Fixes bug #13377. Additional patch - remove reference counting for
  opened binlog files, introduced in initial patch of #13377.
2005-11-14 16:01:10 +03:00
unknown
67df0e19e4 Fixed number of compiler errors on win32.
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  Fixed compiler error for Win32 build. #include "decimal.c" wrere no able to find decimal.c file.
sql/ha_innodb.cc:
  Fixed compiler error for Win32 build.
sql/spatial.cc:
  Fixed compiler error for Win32 build. float8get should be enclosed
  in {} since it is macro on win32 and might cause unmatching blocks.
2005-11-14 15:19:52 +03:00
unknown
fef0912115 ndb - wl#1497 add LinearPool
storage/ndb/src/kernel/vm/testSuperPool.cpp:
  test LinearPool
2005-11-14 12:03:23 +01:00
unknown
63bbb1513a config-win.h:
Disabled yaSSL support for now


include/config-win.h:
  Disabled yaSSL support for now
2005-11-14 04:07:24 +02:00
unknown
0deb1f5555 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


mysql-test/mysql-test-run.pl:
  Auto merged
2005-11-14 02:08:17 +02:00
unknown
c2826d723e mysql-test-run.pl:
Corrected search for 'mysqlimport' executable


mysql-test/mysql-test-run.pl:
  Corrected search for 'mysqlimport' executable
2005-11-14 01:59:15 +02:00
unknown
c07407d106 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-12 15:11:21 +02:00
unknown
029fb8741c 2 More --bdb variables (fix for bug #14895)
- added bdb-cache-parts
- modified bdb-cache-size to support more than 4G
- added bdb-region-size (size of memory pool for storing file names used in transaction)


sql/ha_berkeley.cc:
  - added bdb-cache-parts
  - modified bdb-cache-size to support more than 4G
  - added bdb-region-size (size of memory pool for storing file names used in transaction)
sql/ha_berkeley.h:
  - added bdb-cache-parts
  - modified bdb-cache-size to support more than 4G
  - added bdb-region-size (size of memory pool for storing file names used in transaction)
sql/mysqld.cc:
  - added bdb-cache-parts
  - modified bdb-cache-size to support more than 4G
  - added bdb-region-size (size of memory pool for storing file names used in transaction)
sql/set_var.cc:
  - added bdb-cache-parts
  - modified bdb-cache-size to support more than 4G
  - added bdb-region-size (size of memory pool for storing file names used in transaction)
2005-11-12 11:56:16 +01:00
unknown
dc44851352 Fix for BUG#5686 - #1034 - Incorrect key file for table - only utf8
myisam/ft_parser.c:
  word->len calculation correction.
mysql-test/r/fulltext.result:
  Test case for bug#5686.
mysql-test/t/fulltext.test:
  Test case for bug#5686.
2005-11-12 11:25:14 +04:00
unknown
0b98c606da Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.1-release
into  mysql.com:/space/pekka/ndb/version/my51-rel
2005-11-12 05:14:23 +01:00
unknown
3e57afe698 Support full list of BDB deadlock detection methods. (Bug #14876)
sql/ha_berkeley.cc:
  Add full list of BDB lock detection types.
2005-11-11 16:36:26 -08:00
unknown
26eb2ecc1d Update out-of-date URLs in 'help' text of mysql client. (Bug #14801)
client/mysql.cc:
  Update text, URLs in mysql client 'help' text
2005-11-11 15:23:04 -08:00
unknown
4e1bc5abd8 Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.
support-files/mysql.spec.sh:
  We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
  The fully static RPM build on "build" also does not work with the bundled zlib.
  With this change, we use the bundled zlib for "standard" RPMs (unless fully stytic, "build")
  and the one already installed onm the system for the "max" build which is also labeled "experimental".
2005-11-11 22:18:41 +01:00
unknown
2e3dfebb92 Sync suggestions for bdb_cache_size in my-medium.cnf and my-huge.cnf to
be the same as the suggested innodb_buffer_pool_size.


support-files/my-large.cnf.sh:
  Increase bdb_cache_size
support-files/my-medium.cnf.sh:
  Increase bdb_cache_size
2005-11-11 11:41:23 -08:00
unknown
1c677f8c55 Fixes bug #14569. When no db is selected as current and we do create procedure db.sp()...
we changing current db temporarily and restore it when sp is created. however thd->db
in this case becomes empty string rather than NULL and so all checks of thd->db == NULL 
will be false. So if after this we'll issue create procedure sp2()... without specifying
db it will succeed and create sp with db=NULL, which causes mysqldto crash on 
show procedure status statement.

This patch fixes the problem.


mysql-test/r/sp-error.result:
  Result for bug #14569.
mysql-test/t/sp-error.test:
  Test for bug #14569.
sql/sql_db.cc:
  Fixes bug #14569. When no db is selected as current and we do create procedure db.sp()...
  we changing current db temporarily and restore it when sp is created. however thd->db
  in this case becomes empty string rather than NULL and so all checks of thd->db == NULL 
  will be false. This patch fixes this issue.
sql/sql_parse.cc:
  Fixes bug #14569. Reverted from initial patch to check thd->db for null values only.
2005-11-11 21:01:48 +03:00
unknown
0a69c8d65a Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.1-release
into mysql.com:/M51/clone-5.1
2005-11-11 18:51:22 +01:00
unknown
d05350766c scripts/make_binary_distribution.sh
Adapt to the directory hierarchy change in 5.1, "ndb" -> "storage/ndb".


scripts/make_binary_distribution.sh:
  Adapt to the directory hierarchy change in 5.1, "ndb" -> "storage/ndb".
2005-11-11 18:48:53 +01:00
unknown
5ae3b47cd9 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug14723/mysql-5.0


sql/sp_head.cc:
  Auto merged
2005-11-11 18:12:40 +01:00
unknown
56f43d9d02 Fix bug #13622 Wrong view .frm created if some field's alias contain \n
View .frm parser assumes that query string will take only 1 line, with \n in
aliases query stringmay take several lines thus produces bad .frm file.

'query' parameter type changed from 'string' to 'escaped string'


sql/sql_view.cc:
  Fix bug #13622 \n in column alias results in broken .frm
  'query' parameter type changed to 'escaped string'
mysql-test/r/view.result:
  Test case for bug #13622 Wrong view .frm created if some field's alias contain \n
mysql-test/t/view.test:
  Test case for bug #13622 Wrong view .frm created if some field's alias contain \n
2005-11-11 20:03:32 +03:00
unknown
cb38411696 Fixes bug #14569. In addition to check current db of not being NULL value
it is added a check of not being empty value. When modifying SP with Admin 
application on win32 it does not pass curent database so sp is stored with
db=null which causes a crash later on show procedure status;
2005-11-11 19:06:18 +03:00
unknown
daa84c7fa5 ndb - 5.1.2 build fix: Signal syms in test pgms on hp3750
storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp:
  add some Signal syms to test programs for hp3750, hope it dont break other platforms..
storage/ndb/src/kernel/blocks/print_file.cpp:
  add some Signal syms to test programs for hp3750, hope it dont break other platforms..
2005-11-11 12:47:10 +01:00
unknown
c0e0f57c09 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.1


BitKeeper/deleted/.del-compile-sap-debug~d5408f42e7872e6e:
  Auto merged
BitKeeper/deleted/.del-compile-sap~a5a15ffc19b27505:
  Auto merged
2005-11-11 11:40:48 +01:00
unknown
f24078f7bb ndb - 5.1.2 build fix: array initializer crashes gcc-2.95.3
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  array initializer crashes gcc-2.95.3
2005-11-11 11:36:00 +01:00
unknown
883ae96f66 removed old sap build files
BitKeeper/deleted/.del-compile-sap~a5a15ffc19b27505:
  Delete: BUILD/compile-sap
BitKeeper/deleted/.del-compile-sap-debug~d5408f42e7872e6e:
  Delete: BUILD/compile-sap-debug
2005-11-11 11:20:48 +01:00
unknown
425207c938 Fixed BUG#14723: Dumping of stored functions seems to cause corruption
in the function body
  Changed the way the end of query was found from the lex state.
  The routine body was not extracted correctly when using the
  /*!version ... */ wrapper (in dump files); for some types of routines
  (e.g. with a label at the first begin), the trailing "*/" was not skipped.


mysql-test/r/sp.result:
  New test case for BUG#14723.
mysql-test/t/sp.test:
  New test case for BUG#14723.
sql/sp_head.cc:
  Changed the way the end of the definition and body is found from the lex state.
  In the case of /*!version */ wrappers we must take the trailing " */" into account.
2005-11-11 11:10:52 +01:00
unknown
b10c7d60bd Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-14662
2005-11-11 12:10:19 +02:00
unknown
2d4711a1b2 unneeded files
BitKeeper/deleted/.del-compile-sap-debug~d5408f42e7872e6e:
  Delete: BUILD/compile-sap-debug
BitKeeper/deleted/.del-compile-sap~a5a15ffc19b27505:
  Delete: BUILD/compile-sap
2005-11-11 10:54:01 +01:00
unknown
26cce41b72 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-14662
2005-11-11 11:41:21 +02:00
unknown
9a0da055fd Fix for BUG#14662: view column in ORDER BY considered ambiguous if SELECT contains
the same column as an aliased and as a non-aliased column.

The problem was that Item_direct_view_ref::eq() was first comparing view columns
by name, and in this case the name of one of them is different since it is aliased.


mysql-test/r/select.result:
  Added test for BUG#14662.
mysql-test/t/select.test:
  Added test for BUG#14662.
sql/item.cc:
  Changed the way view column refenreces are compared. Two view columns are
  equal if they resolve to the same result field of a view.
2005-11-11 11:40:35 +02:00
unknown
534275921e Fix for bug#13818 SHOW CREATE VIEW / TABLE and information_schema.views fail
for invalid view
 Permit SHOW CREATE VIEW, SHOW CREATE TABLE, and retrieval of metadata from
 information_schema for invalid views


mysql-test/r/information_schema.result:
  Fix for bug#13818 SHOW CREATE VIEW / TABLE and information_schema.views fail 
                    for invalid view
   test case
mysql-test/t/information_schema.test:
  Fix for bug#13818 SHOW CREATE VIEW / TABLE and information_schema.views fail 
                    for invalid view
   test case
2005-11-11 13:39:46 +04:00
unknown
5d425f9361 Manual merge. 2005-11-11 03:28:35 +03:00
unknown
1f58d23d63 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818


sql/sql_show.cc:
  Auto merged
2005-11-11 03:25:24 +03:00
unknown
615921eb55 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/show-5.1-new


sql/sql_show.cc:
  Auto merged
2005-11-10 15:42:56 -08:00
unknown
b50c5b014a Show engines has been extended to now report if an engine has transactions, XA, or savepoints.
sql/sql_show.cc:
  Added new fields to show engines.
2005-11-10 15:40:00 -08:00
unknown
986bc3fbe6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818
2005-11-11 00:57:36 +03:00
unknown
15763e1f28 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-11-10 13:55:14 -08:00
unknown
cadfe9991e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-11-10 21:57:04 +02:00