Commit graph

24943 commits

Author SHA1 Message Date
sergefp@mysql.com
6289ba1570 [Patch from Konstantin] Enable InnoDB cursor view functionality. 2005-07-29 00:32:03 +00:00
joerg@mysql.com
967bf6d350 Manual merge of 5.0.10a back to the general tree. 2005-07-28 18:30:54 +02:00
marko@hundin.mysql.fi
f0f2738c4c row0sel.c:
row_sel_store_mysql_rec(): Make comment about space padding
  more accurate.
2005-07-28 13:15:36 +03:00
marko@hundin.mysql.fi
4b0d6a3877 row_sel_store_mysql_rec(): Convert NULL true VARCHAR columns
correctly.
2005-07-28 12:30:52 +03:00
gluh@mysql.com
c878d14933 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
2005-07-28 12:02:42 +05:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
4df1652294 Missing initialisation of table->s->db in lock_table_name
Bug #12112
2005-07-27 18:13:48 -04:00
gluh@eagle.intranet.mysql.r18.ru
ef2c7812f3 Fix for bug#12127 triggers do not show in info_schema before they are used if set to the database(2nd version)
use db name of table which trigger belongs to
  instead of thd->db name during trigger body parsing
2005-07-27 16:17:05 +05:00
joerg@mysql.com
bcace631ee Fix shortcircuit of 127.0.0.1 -> localhost lookup on little-endian machines. (Bug #11822)
(Originally:   1.1891 05/07/25 12:07:47 jimw@mysql.com )
2005-07-27 13:01:48 +02:00
ramil@mysql.com
5ac378ba15 after-merge fix 2005-07-27 15:57:00 +05:00
ramil@mysql.com
e43dff67f5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-27 15:09:06 +05:00
hf@deer.(none)
29cfa64f68 Merging 2005-07-27 14:37:16 +05:00
hf@deer.(none)
faef3a442e Merge deer.(none):/home/hf/work/mysql-4.1.11329
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-07-27 13:02:10 +05:00
hf@deer.(none)
a6a57d061d Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.11329
2005-07-27 13:00:30 +05:00
hf@deer.(none)
41c83870a2 Merge deer.(none):/home/hf/work/mysql-4.1.9110
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-07-27 12:56:23 +05:00
hf@deer.(none)
a18855bfc5 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.9110
2005-07-27 12:54:32 +05:00
hf@deer.(none)
f2944dca2a Merging 2005-07-27 12:49:44 +05:00
hf@deer.(none)
059d852d83 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.10839
2005-07-27 12:45:31 +05:00
hf@deer.(none)
b17a35e06f Merge 2005-07-27 12:39:49 +05:00
hf@deer.(none)
475566aabd Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.6740
2005-07-27 12:32:39 +05:00
marko@hundin.mysql.fi
6d6d90d221 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/marko/mysql-5.0
2005-07-26 23:23:08 +03:00
marko@hundin.mysql.fi
f18796bc51 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  hundin.mysql.fi:/home/marko/mysql-4.1
2005-07-26 23:15:12 +03:00
hf@deer.(none)
a776edbed1 Fix for bug #11329 (lowercase_table.test fails) 2005-07-26 20:59:43 +05:00
igor@rurik.mysql.com
ffd08ef790 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-07-26 08:25:25 -07:00
igor@rurik.mysql.com
c3feb18396 item.h:
Post review change in Item_ref::get_tmp_table_field (bug #11412).
2005-07-26 08:20:42 -07:00
bar@mysql.com
bfe8ba7de7 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 17:53:18 +05:00
bar@mysql.com
92e7d181f9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12109
2005-07-26 16:48:32 +05:00
marko@hundin.mysql.fi
5dd8eeef3a Merge hundin.mysql.fi:/home/marko/mysql-4.1
into  hundin.mysql.fi:/home/marko/mysql-5.0
2005-07-26 14:43:48 +03:00
bar@mysql.com
a009ec4a9e Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 16:43:47 +05:00
bar@mysql.com
637ec56206 ctype-big5.c:
ctype-cp932.c:
ctype-gbk.c:
ctype-mb.c:
ctype-simple.c:
ctype-sjis.c:
ctype-ucs2.c:
ctype-ujis.c:
ctype-utf8.c:

  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
2005-07-26 16:38:10 +05:00
marko@hundin.mysql.fi
a89939c8e7 InnoDB: Do not flush after each write, not even when creating the
data files.  Previously, writes were flushed until the doublewrite
buffer was created.  That would be too slow on systems where
os_file_flush() [or fsync(2)] is slow.  (Bug #12125)
2005-07-26 14:03:34 +03:00
bar@mysql.com
4a85e560a5 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 14:54:40 +05:00
bar@mysql.com
991e344285 Bug#10201 group_concat returns string with binary collation
item.cc:
  After merge fixes.
func_gconcat.result:
  After merge fixes
2005-07-26 14:52:33 +05:00
bar@mysql.com
0255803b4e Merge mysql.com:/usr/home/bar/mysql-4.1.b10201
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 13:25:18 +05:00
bar@mysql.com
31b1bdc52a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b10201
2005-07-26 12:53:06 +05:00
bar@mysql.com
0c2035b7bd func_gconcat.result, func_gconcat.test:
Adding test
item_sum.cc:
  Adding a call for collation/charset aggregation,
      to collect attributes from the arguments. The actual bug fix.
item_func.h, item_func.cc, item.h, item.cc:
  - Removing collation aggrgation functions from Item_func class
      in item.cc, and adding it as non-class functions in item.cc
      to be able to reuse this code for group_concat.
      - Adding replacement for these functions into Item_func class
      as wrappers for moved functions, to minizize patch size,
2005-07-26 12:52:02 +05:00
jan@hundin.mysql.fi
ae3adcd4c3 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jan/mysql-5.0
2005-07-26 10:19:36 +03:00
ramil@mysql.com
9f2624ee51 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b11546
2005-07-26 12:19:35 +05:00
ramil@mysql.com
afb1ad8415 a fix (bug #11546: Bad error message from inserting out of range values, SQL_MODE='tradition'). 2005-07-26 12:18:35 +05:00
joreland@mysql.com
c58057346c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-26 09:08:27 +02:00
hf@deer.(none)
9bab1c09a6 Fix for bug #9110 (Max_join_size error) 2005-07-26 12:08:00 +05:00
joreland@mysql.com
1b31399774 ndb - changed config 2005-07-26 09:06:37 +02:00
joreland@mysql.com
3b8275d062 Merge mysql.com:/home/jonas/src/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-26 08:09:38 +02:00
joreland@mysql.com
122758e5c8 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-26 08:05:06 +02:00
joreland@mysql.com
d3567611c6 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-26 08:02:23 +02:00
jan@hundin.mysql.fi
3d5c42c6f5 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jan/mysql-5.0
2005-07-26 09:02:02 +03:00
joreland@mysql.com
be8d46028f ndb_config test requires ndb 2005-07-26 07:59:10 +02:00
igor@rurik.mysql.com
62cf03f8f0 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-07-25 18:46:24 -07:00
igor@rurik.mysql.com
24d148d025 sql_select.cc:
Fixed bug #11412.
  Reversed the patch of cs 1.1934 for the function 
  create_tmp_table. Modified the function to support
  tem_ref objects created for view fields.
item_buff.cc:
  Fixed bug #11412.
  Modified implementation of new_Cached_item to support
  cacheing of view fields.
item.h:
  Fixed bug #11412.
  Changed implementation of Item_ref::get_tmp_table_field and
  added Item_ref::get_tmp_table_item to support Item_ref objects
  created for view fields.
view.test, view.result:
  Added a test case for bug #11412.
2005-07-25 12:57:23 -07:00
bar@mysql.com
975b4969a5 charset.c:
Bug#12109 possible locking bug in init_available_charset
  Recheck charset_initialized inside locked code,
  to garantee two threads are not entering
  consequently.
2005-07-25 21:34:20 +05:00
joreland@mysql.com
88006d6a3c Merge mysql.com:/home/jonas/src/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-25 15:33:17 +02:00