mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24925 commits 2781 branches 343 tags 1.6 GiB
Commit graph

24925 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
joreland@mysql.com
3c59758fdc Merge mysql.com:/home/jonas/src/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-5.0
 2005-07-25 15:31:38 +02:00
lenz@mysql.com
ef3bc773db Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-07-25 15:22:42 +02:00
lenz@mysql.com
5dc9a48594 Merge mysql.com:/space/my/mysql-4.1-merge 
into mysql.com:/space/my/mysql-4.1
 2005-07-25 15:19:27 +02:00
lenz@mysql.com
bbd06a333a Merge mysql.com:/space/my/mysql-4.1-merge 
into mysql.com:/space/my/mysql-5.0-build
 2005-07-25 15:04:28 +02:00
lenz@mysql.com
0c30acae32 - merge from 4.0: updated scripts/Makefile.am to properly create but not install 
make_binary_distribution, make_sharedlib_distribution and make_win_src_distribution
- removed make_win_binary_distribution.sh
 2005-07-25 14:39:23 +02:00
lenz@mysql.com
d9bacfa236 - Make sure the scripts make_binary_distribution, make_sharedlib_distribution and 
make_win_src_distribution are created, but not installed
- removed make_win_binary_distribution.sh as it's obsolete and outdated
 2005-07-25 14:14:24 +02:00
joreland@mysql.com
ca6eb7c70a Merge mysql.com:/home/jonas/src/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-4.1-push
 2005-07-25 13:48:34 +02:00
joreland@mysql.com
0cd9e2e269 fix compile error 2005-07-25 13:47:40 +02:00
joreland@mysql.com
c12b41605d Merge mysql.com:/home/jonas/src/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-5.0
 2005-07-25 13:23:34 +02:00
joreland@mysql.com
01f5d4effd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-4.1-push
 2005-07-25 12:48:24 +02:00
joreland@mysql.com
7040b3277a Merge mysql.com:/home/jonas/src/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-4.1-push
 2005-07-25 12:42:32 +02:00
joreland@mysql.com
07cdfdca69 ndb - Fix LCP during SR parameters 2005-07-25 12:41:25 +02:00
hf@deer.(none)
f8da80e177 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.10839
 2005-07-25 14:38:22 +05:00
georg@lmy002.wdf.sap.corp
5498a13751 fix for bug #7924. 
added export symbols mysql_server_init and 
mysql_server_end to allow client to connect to external and embedded
server using the same code (required for Connector/OO.org). (Backport from 5.0 - cs. 1.35)
 2005-07-25 07:51:17 +02:00
joreland@mysql.com
fe800b95b3 Merge mysql.com:/home/jonas/src/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-24 21:22:15 +02:00
joreland@mysql.com
8fc24f2634 merge error 2005-07-24 21:20:45 +02:00
joreland@mysql.com
4fbc43abc1 Merge mysql.com:/home/jonas/src/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-24 21:16:21 +02:00