mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24913 commits 2790 branches 343 tags 1.7 GiB
Commit graph

24913 commits

This branch
This branch
All branches
Author SHA1 Message Date
jonas@eel.(none)
6399a93ac2 Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-5.0
 2005-08-18 14:25:00 +02:00
jonas@eel.(none)
3b68047235 bug#12118 - ndb alter table data loss 
Split table version into 2 (major, minor)
  Impl. signaling to API when table has been altered
  Allow running transactions to use any minor number for transactions
 2005-08-18 14:02:25 +02:00
joreland@mysql.com
c0b4c8f13d ndb - only run ndb_config test when using "default" config 2005-07-26 16:12:17 +02: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
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
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
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
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
joreland@mysql.com
0345998f5d Merge mysql.com:/home/jonas/src/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-5.0
 2005-07-24 20:41:38 +02:00
joreland@mysql.com
b285050e52 ndb - add mysql-test-run test case for ndb_config 2005-07-24 17:35:39 +02:00
joreland@mysql.com
293145b314 Merge mysql.com:/home/jonas/src/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-5.0
 2005-07-24 08:27:16 +02:00
georg@lmy002.wdf.sap.corp
35b66a40c2 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-07-24 08:12:20 +02:00
joreland@mysql.com
5490cdfb24 Add tool to extract config info from ndb_mgmd 2005-07-23 12:06:02 +02:00
bell@sanja.is.com.ua
f5833989ba Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
 2005-07-23 07:55:07 +03:00
bell@sanja.is.com.ua
bfdb6ca3cf store SERVER_MORE_RESULTS_EXISTS in key of query cache (BUG#6897) 2005-07-23 07:51:25 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
ca0803a024 Undefined RINT for Netware. 2005-07-23 01:11:29 +03:00
jimw@mysql.com
d6d1a9aae2 Merge mysql.com:/home/jimw/my/mysql-5.0-11227 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-22 12:39:47 -07:00
jimw@mysql.com
421f267b7f Merge mysql.com:/home/jimw/my/mysql-5.0-11213 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-22 12:38:14 -07:00