Commit graph

27625 commits

Author SHA1 Message Date
unknown
a67e6fdf8b Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
2005-11-05 22:45:54 -08:00
unknown
502495271d Post review fixes. 2005-11-05 22:41:36 -08:00
unknown
34da71709a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-oct03-push


sql/mysql_priv.h:
  Auto merged
2005-11-05 05:46:41 +03:00
unknown
19b733aad0 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-11-04 15:03:29 -08:00
unknown
61b86c5991 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-04 15:44:21 +02:00
unknown
1dcffc817a Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
into  mysql.com:/home/cps/mysql/trees/mysql-5.0


sql/spatial.h:
  Auto merged
2005-11-04 16:44:20 +03:00
unknown
57923440f3 fix --ansi --pedantic compilation failure 2005-11-04 16:17:43 +03:00
unknown
5ec829eff2 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-04 15:12:23 +02:00
unknown
d4a7867a9e Reorder struct elements to be more optimal for 64 bit computers
(Main reason for reordering was to get rid of compiler warnings for order of element initialization)


sql/log.cc:
  Remove compiler warning
sql/sql_class.h:
  Reorder MYSQL_LOG struct elements to be more optimal for 64 bit computers
  (Main reason for reordering was to get rid of compiler warnings for order of element initialization)
2005-11-04 15:12:22 +02:00
unknown
50b212ad1b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-04 12:09:46 +01:00
unknown
15f2b1494d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-04 09:23:09 +01:00
unknown
29e07bcb05 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-04 10:03:32 +02:00
unknown
4e60227fe5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0


sql/mysqld.cc:
  Auto merged
2005-11-04 10:03:31 +02:00
unknown
5dcd44e3ed DROP created procedures
(Caused sp-security to fail)
2005-11-04 10:02:43 +02:00
unknown
71898b3e24 Merge mysql.com:/home/jimw/my/mysql-5.0-9815
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-03 17:24:24 -08:00
unknown
7c2e2961da Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-03 22:42:26 +02:00
unknown
d8f1fdc48d Fixes during review of new code
Destroy LOCK_uuid_generator


sql/ha_berkeley.h:
  Fix portability problem (warnings from gcc on 32 bit linux)
sql/ha_ndbcluster.cc:
  Fixed portability problem
sql/mysqld.cc:
  Destroy LOCK_uuid_generator
2005-11-03 22:42:25 +02:00
unknown
0d8e2ba98e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-oct03-push


sql/sql_select.cc:
  Auto merged
2005-11-03 22:35:18 +03:00
unknown
76199a501b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hasky.mysql.fi:/home/jani/mysql-5.0
2005-11-03 21:17:23 +02:00
unknown
5ea3382fe4 Disabled ps_protocol for two statements. 2005-11-03 20:29:21 +02:00
unknown
443c40349c Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into  fedora.(none):/home/reggie/bk/mysql-5.0-new
2005-11-03 11:01:28 -06:00
unknown
91b1630d10 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-11-03 19:01:28 +02:00
unknown
77afc16900 test enabled 2005-11-03 21:01:27 +04:00
unknown
579cac8f24 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551


BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
2005-11-03 20:58:43 +04:00
unknown
b5746406b5 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551


sql/sql_select.cc:
  Auto merged
2005-11-03 19:47:08 +04:00
unknown
17742635f3 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-11-03 17:44:57 +02:00
unknown
840834c1ef Disabled a test temporarily. 2005-11-03 17:39:40 +02:00
unknown
a50bc7979d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 16:13:20 +01:00
unknown
4b63b4adc0 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_view.h:
  Auto merged
sql/table.cc:
  Auto merged
2005-11-03 16:43:05 +02:00
unknown
e5852adccf Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 16:43:04 +02:00
unknown
fa8dafe5bb opt_range.cc:
Additional fix for bug#14093


sql/opt_range.cc:
  Additional fix for bug#14093
2005-11-03 17:43:03 +03:00
unknown
5af7ca80d9 Changes in get_table_type() and mysql_frm_type(). The main problem was
that in mysql_rm_table_part2_with_lock() previously we needed to open
same file twice. Now once is enough.


sql/mysql_priv.h:
  Merged functions get_table_type() and mysql_frm_type() into one,
  using the name from latter one.
sql/sql_base.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_delete.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_rename.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_show.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_table.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_view.cc:
  Merged code from get_table_type() and mysql_frm_type() into the latter one.
sql/sql_view.h:
  Function prototype changes.
sql/table.cc:
  No longer needed.
2005-11-03 16:10:11 +02:00
unknown
3b6168fadc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 15:02:16 +01:00
unknown
34ffbfebf2 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 15:39:55 +02:00
unknown
46865aae34 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 16:23:47 +03:00
unknown
95aeaabdcc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 14:23:42 +01:00
unknown
4d155f06ee Merge mysql.com:/home/psergey/mysql-5.0-bug14026-r2
into mysql.com:/home/psergey/mysql-5.0-oct03-push


mysql-test/r/join_nested.result:
  Auto merged
mysql-test/t/join_nested.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/table.h:
  Auto merged
2005-11-03 16:21:21 +03:00
unknown
8a4c773a7b Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
Makefile.am:
  Merged from 4.1
2005-11-03 15:01:04 +02:00
unknown
5a20663457 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-11-03 14:48:09 +02:00
unknown
4f2fe28773 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-14210


sql/handler.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
2005-11-03 15:24:55 +03:00
unknown
9c241a07fe Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 16:19:46 +04:00
unknown
f68daacfa8 Merging
mysql-test/r/ctype_cp932_binlog.result:
  test result fixed
mysql-test/t/ctype_cp932_binlog.test:
  test fixed with 5.0 specific
2005-11-03 16:17:11 +04:00
unknown
3fa0dd23e0 A fix and a test case for Bug#14210 "Simple query with > operator on
large table gives server crash": make sure that when a MyISAM temporary
table is created for a cursor, it's created in its memory root,
not the memory root of the current query.


mysql-test/r/sp.result:
  Test results fixed: a test case for Bug#14210
mysql-test/t/sp.test:
  A test case for Bug#14210 "Simple query with > operator on large table 
  gives server crash"
sql/handler.cc:
  - rewrite get_new_handler to accept a memory root and use it for
sql/handler.h:
  - get_new_handler declaration changed
sql/opt_range.cc:
  - get_new_handler declaration changed
sql/sql_base.cc:
  - get_new_handler declaration changed
sql/sql_select.cc:
  - the actual fix for Bug#14210. In create_myisam_from_heap we should
  create the new table handler in TABLE::mem_root, not in THD::mem_root:
  the latter is freed shortly after cursor is open.
  - adjust create_tmp_table to explicitly supply &table->mem_root
  to get_new_handler when creating a handler for a new temporary table
sql/sql_table.cc:
  - get_new_handler declaration changed
sql/table.cc:
  - get_new_handler declaration changed
sql/unireg.cc:
  - get_new_handler declaration changed
tests/mysql_client_test.c:
  A test case for Bug#14210 "Simple query with > operator on large table
   gives server crash": a C API test case is worth adding because of different
  memory allocation/freeing patterns in handling of C API and SP cursors
2005-11-03 14:20:13 +03:00
unknown
1484d54821 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


Makefile.am:
  Merged from 4.0
mysql-test/mysql-test-run.sh:
  Merged from 4.0
2005-11-03 13:02:05 +02:00
unknown
6d4326423e Merge mysql.com:/home/hf/work/mysql-4.1.14183
into mysql.com:/home/hf/work/mysql-5.0.9551


BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
2005-11-03 14:58:36 +04:00
unknown
dd490fd2d5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/14093-bug-5.0-mysql


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item.h:
  Auto merged
2005-11-03 13:55:08 +03:00
unknown
4535c354e3 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9551


sql/sql_select.cc:
  Auto merged
2005-11-03 14:54:13 +04:00
unknown
bb841518b9 Fix bug #14093 Query takes a lot of time when date format is not valid
Invalid date like 2000-02-32 wasn't converted to int, which lead to not
using index and comparison with field as astring, which results in slow
query execution.

convert_constatn_item() and get_mm_leaf() now forces MODE_INVALID_DATES to
allow such conversion.


sql/item.h:
  Fix bug #14093 Query takes a lot of time when date format is not valid
  To Item_int_with_ref added method real_item() which returns ref.
sql/item_cmpfunc.cc:
   Fix bug #14093 Query takes a lot of time when date format is not valid
  convert_constant_item() now allows conversion of invalid dates like 2000-01-32 to int to make it possible to use index when comparing fields with such dates.
sql/opt_range.cc:
   Fix bug #14093 Query takes a lot of time when date format is not valid
  get_mm_leaf() modified so it allows index usage for comparing fields with invalid dates like 2000-01-32.
mysql-test/r/select.result:
  Test case for bug#14093 Query takes a lot of time when date format is not valid
mysql-test/t/select.test:
  Test case for bug#14093 Query takes a lot of time when date format is not valid
2005-11-03 13:53:49 +03:00
unknown
f38c7bfd3f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug13957/my50-bug13957


configure.in:
  Auto merged
2005-11-03 11:01:13 +01:00
unknown
fb4c949f57 Added test-force to Makefile. 2005-11-03 11:47:54 +02:00