mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19685 commits 2784 branches 343 tags 1.6 GiB
Commit graph

19685 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
f9a394dbdd InnoDB: Fix Bug #7350 without hard-coding charset-collation numbers. 
innobase/data/data0type.c:
  Add mbminlen and mbmaxlen to dtype_t
innobase/include/data0type.h:
  Add mbminlen and mbmaxlen to dtype_t
  Add dtype_get_mbminlen() and dtype_get_mbmaxlen()
innobase/include/data0type.ic:
  Add dtype_set_mblen()
  Add dtype_get_mbminlen() and dtype_get_mbmaxlen()
  Replace innobase_is_mb_cset() with innobase_get_mb_cset()
innobase/include/row0mysql.h:
  Add mbminlen and mbmaxlen
innobase/include/row0mysql.ic:
  Detect UCS2 collations based on mbminlen
innobase/row/row0sel.c:
  Detect UCS2 collations based on mbminlen
sql/ha_innodb.cc:
  Replace innobase_is_mb_cset() with innobase_get_mb_cset()
  build_template(): Initialize templ->mbminlen and templ->mbmaxlen
 2005-02-08 16:41:34 +02:00
unknown
63bcbfc433 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/jan/mysql-5.0
 2005-02-08 14:48:25 +02:00
unknown
b0cc9d7ad7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/orca/space/pekka/ndb/version/my50
 2005-02-08 11:12:55 +01:00
unknown
c1139fa825 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-02-08 11:12:54 +01:00
unknown
7e0ac12bd3 ndb - workaround to strnxfrm 5.0 problem 
ndb/src/common/util/NdbSqlUtil.cpp:
  strnxfrm bug, may not write the length it says
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  fix index in debug print
ndb/test/ndbapi/testOIBasic.cpp:
  do not generate too many mb chars, not checked in TUP
 2005-02-08 10:33:58 +01:00
unknown
0348c81642 Merge mysql.com:/home/my/mysql-4.1 into mysql.com:/home/my/mysql-5.0 2005-02-08 11:18:40 +02:00
unknown
8947628ca6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-08 10:55:06 +02:00
unknown
6a1e756211 ndbcluster now runs clean in 4.1, 5.0 may still need some work 2005-02-08 06:11:05 +01:00
unknown
2eeaddebf8 Merge mysql.com:/home/jimw/my/mysql-5.0-7931 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-02-07 12:20:37 -08:00
unknown
7814366660 Merge mysql.com:/home/jimw/my/mysql-5.0-6368 
into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/sql_lex.cc:
  Auto merged
 2005-02-07 12:20:08 -08:00
unknown
9c99d6b267 Merge mysql.com:/home/jimw/my/mysql-5.0-7856 
into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged
 2005-02-07 12:19:32 -08:00
unknown
a332242e76 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-07 21:10:15 +02:00
unknown
5be12eba73 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-02-07 19:31:02 +01:00
unknown
f9e0e5a7c5 Merge with 4.1 to get bug fix 
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/item_cmpfunc.cc:
  manual merge
sql/item_func.cc:
  no changes
 2005-02-07 19:42:03 +02:00
unknown
39e8e24839 Merge 
mysql-test/include/have_ndb.inc:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge
 2005-02-07 18:05:11 +01:00
unknown
41dffbb150 mysql-test-run.sh: 
fixed start-and-exit flag


mysql-test/mysql-test-run.sh:
  fixed start-and-exit flag
 2005-02-07 17:59:46 +01:00
unknown
ac630383f4 have test suite continue even if ndbcluster fails to start if --force flag is set 2005-02-07 17:46:52 +01:00
unknown
bb05eab8e9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0


sql/item.cc:
  Auto merged
 2005-02-07 18:26:14 +02:00
unknown
84e26faf79 Added comment 2005-02-07 18:24:21 +02:00
unknown
edae64f4cb Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1


sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
 2005-02-07 18:14:31 +02:00
unknown
d6ed8cd709 Fixed bug in HAVING when refering to RAND() through alias 
(BUG 8216)


mysql-test/r/group_by.result:
  New test case
mysql-test/r/user_var.result:
  Test changed (to be more correct) with bug fix
mysql-test/t/group_by.test:
  Added test for HAVING bug
sql/item_cmpfunc.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_func.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_row.cc:
  Fixed bug in HAVING when refering to RAND()
sql/item_strfunc.cc:
  Fixed bug in HAVING when refering to RAND()
sql/unireg.h:
  Added PSEUDO_TABLES_BITS for easy testing of real table reference
 2005-02-07 18:13:57 +02:00
unknown
abf68e41ae Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/wl1967.extra1
 2005-02-07 15:27:17 +00:00
unknown
e15bf18106 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


support-files/mysql.spec.sh:
  Auto merged
 2005-02-07 16:27:16 +01:00
unknown
4a196cc4d3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-02-07 16:25:51 +01:00
unknown
e7119f62a8 mysql.spec.sh: 
removed typo
  moved pre to post for directory creation
  add changelog comments


support-files/mysql.spec.sh:
  removed typo
  moved pre to post for directory creation
  add changelog comments
 2005-02-07 16:25:07 +01:00
unknown
72896c4215 Ensure that slaves have normal COMMIT behaviour after WL#1967 
sql/slave.cc:
  Ensure that slaves have normal COMMIT behaviour
 2005-02-07 13:15:48 +00:00
unknown
46ca7d1f63 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
 2005-02-07 13:48:02 +01:00
unknown
61da5b4d25 Small changes after Tomas review 
sql/ha_ndbcluster.cc:
  Added a pthread_exit before thread exists
sql/ha_ndbcluster.h:
  Changed storage of commit_count from uint to ulonglong
 2005-02-07 13:46:13 +01:00
unknown
8602ef9328 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


BUILD/compile-solaris-sparc-purify:
  Auto merged
 2005-02-07 13:27:44 +01:00
unknown
5b3d102f15 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-07 13:26:45 +01:00
unknown
fc16a8769e ndb_basic.test: 
corrected typo


mysql-test/t/ndb_basic.test:
  corrected typo
 2005-02-07 13:26:44 +01:00
unknown
f3f2ec2f91 compile-solaris-sparc-purify: 
Set CCLD as well


BUILD/compile-solaris-sparc-purify:
  Set CCLD as well
 2005-02-07 13:25:03 +01:00
unknown
c6cf17187d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-07 13:15:40 +01:00
unknown
0fcfaa6c66 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-02-07 13:15:39 +01:00
unknown
6241e12ba5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-07 11:44:17 +01:00
unknown
42116bf2e1 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-07 13:41:21 +03:00
unknown
625babde94 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-02-07 11:26:18 +01:00
unknown
2984b0e4bd small testcase update 
BitKeeper/etc/ignore:
  Added support-files/ndb-config-2-node.ini to the ignore list
 2005-02-07 11:17:24 +01:00
unknown
7eedc24466 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-07 10:26:09 +01:00
unknown
292053d9a9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-02-07 10:23:31 +01:00
unknown
63fa66f059 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/jan/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
 2005-02-07 11:23:19 +02:00
unknown
ddb47b9e41 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0
 2005-02-07 11:23:19 +02:00
unknown
e7dceff534 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-02-07 10:23:18 +01:00
unknown
d6e96c55f0 Merge 
sql/ha_ndbcluster.cc:
  SCCS merged
 2005-02-07 10:13:07 +01:00
unknown
aa2ac91c97 ha_ndbcluster.cc: 
corrected typo in previous changeset


sql/ha_ndbcluster.cc:
  corrected typo in previous changeset
 2005-02-07 09:58:37 +01:00
unknown
2359f1fa3e Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0


sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
 2005-02-07 11:57:14 +03:00
unknown
d422094c0a Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1 
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
 2005-02-07 02:19:29 -06:00
unknown
e4add35d34 Do-solaris-pkg: 
Minor tweaks to work properly


Build-tools/Do-solaris-pkg:
  Minor tweaks to work properly
 2005-02-07 02:18:12 -06:00
unknown
7fd1f098c3 Relaxed locking in INSERT...SELECT, single table UPDATE...SELECT and 
single table DELETE...SELECT clauses when innobase_locks_unsafe_for_binlog
is used and isolation level of the transaction is not serializable. 
InnoDB uses consistent read in these cases for a selected table.
 2005-02-07 10:12:40 +02:00
unknown
1c44b9e831 Merge 
sql/ha_ndbcluster.cc:
  merge
 2005-02-07 08:54:35 +01:00