mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43141 commits 2778 branches 343 tags 1.6 GiB
Commit graph

966 commits

Author SHA1 Message Date
marty@flipper.bredbandsbolaget.se
eb729f9a29 Merge flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.0 
into flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.1
 2005-06-23 10:58:37 +02:00
ndbdev@dl145b.mysql.com
be1177c15b merge 2005-06-14 00:05:27 +02:00
tulin@dl145c.mysql.com
e08993f069 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
 2005-06-13 20:40:53 +02:00
tulin@dl145c.mysql.com
57ddf5223f logging_ok: 
Logging to logging@openlogging.org accepted
DbtcMain.cpp, testTimeout.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
 2005-06-13 19:45:15 +02:00
igor@igor-inspiron.creware.com
750fca61f9 ctype_utf8.test, ctype_utf8.result: 
Added a test case for bug #11167.
sql_select.cc:
  Fixed bug #11167.
  In 4.1 char/varchar fields are limited by 255 characters in
  length that make them longer than 255 bytes in size for such
  character sets as UTF8. The functions store_record_in_cache
  and read_cached_records did not take into account this
  Moreover the code did not take into account that the size
  of the varchar fields in 5.0 can be up to 65535 bytes
 2005-06-13 06:10:19 -07:00
joreland@mysql.com
84a04b4a9d merge 2005-06-13 14:09:09 +02:00
joreland@mysql.com
54cff2bc30 merge 2005-06-13 08:05:29 +02:00
obarnir@mysql.com
156d351e1d Adding auxiliary scripts that allow to display messages in result files from within test files 
- show_msg.inc   - displays a message followed by a line of '-' at the length of the messgae
 - show_msg80.inc - displays a message followed by a line of '-' with a fixed length of 80
 2005-06-09 11:01:23 -07:00
igor@rurik.mysql.com
c963b12fd3 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-07 06:38:05 -07:00
elliot@mysql.com
2a1f5c0748 Accepted openlogging 2005-06-07 05:10:18 -04:00
tomas@poseidon.ndb.mysql.com
f6d51a44f4 Merge 2005-06-04 19:26:35 +02:00
reggie@monster.
0e139b8908 Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0 2005-06-02 12:36:55 -05:00
reggie@monster.
7b9d4eaa92 fixed compile problem by replacing W_OK with F_OK 2005-06-02 11:12:58 -05:00
igor@igor-inspiron.creware.com
186e8c5891 item_func.h: 
Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
item_func.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
item_cmpfunc.h, item_cmpfunc.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  Item_func_coalesce and Item_func_ifnull now
  inherit from a modified Item_func_numhybrid.
case.test, case.result:
  Added test cases for bug #9939.
 2005-06-02 07:27:02 -07:00
tomas@poseidon.ndb.mysql.com
5088b28d09 Merge 2005-05-31 14:37:47 +02:00
patg@radha.local
a6af23a046 changes to fix joins not working (bug #10848). New tests, as well as table->status being set in index_read_idx 2005-05-25 02:15:09 +02:00
gbichot@bk-internal.mysql.com
a49ccfe6f0 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into bk-internal.mysql.com:/data0/bk/mysql-5.0
 2005-05-24 00:31:28 +02:00
gbichot@bk-internal.mysql.com
76a20eb397 marking the file gone again to hopefully get the tree on its feet 2005-05-23 23:54:39 +02:00
tulin@dl145c.mysql.com
03590c20bd merge 2005-05-18 22:26:23 +02:00
jimw@mysql.com
3f6aad900c Resolve merge from 4.1 2005-05-18 11:06:34 -07:00
schwenke@lmy003.wdf.sap.corp
badfc2e4a9 new build scripts for SAP team 2005-05-18 15:28:51 +02:00
tulin@dl145c.mysql.com
13bbb3dbb3 ndberror.c: 
updated error message for ndb
 2005-05-18 10:22:27 +02:00
tulin@dl145c.mysql.com
23f79bd1f2 merge 2005-05-17 10:17:53 +02:00
tulin@dl145c.mysql.com
9a6cc9172a removed include of bitvector.h 
result fix Tables_in_information_schema -> Tables_in_INFORMATION_SCHEMA
 2005-05-16 13:41:34 +02:00
bell@book.sanja.is.com.ua
1ff9f55920 relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#10020) 2005-05-16 12:19:10 +03:00
serg@serg.mylan
40ce1e174d merged 2005-05-14 19:28:29 +02:00
konstantin@mysql.com
e5c916f7e8 Merge 2005-05-13 13:26:08 +02:00
antony@ltantony.xiphis.org
7b202354aa create select_lex.options2 to store more bits 2005-05-12 18:09:32 +01:00
tulin@dl145c.mysql.com
12b4fb158c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-10 20:35:14 +02:00
holyfoot@hf-ibm.(none)
1851a38b2f Fix for bug #10493 (SJIS fields are not correctly saved) 2005-05-10 02:15:59 +05:00
lars@mysql.com
e76c641190 Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1 2005-05-09 11:45:59 +02:00
lars@mysql.com
bf48175cf4 Merge mysql.com:/home/bkroot/mysql-5.1 into mysql.com:/home/bk/mysql-5.1 2005-05-09 11:17:32 +02:00
mskold@mysql.com
9e1117c3e5 Merge 2005-05-08 22:52:55 +02:00
mwagner@ultrafly.mysql.com
b0774772d9 errmsg.txt: 
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
 2005-05-08 19:14:28 +02:00
antony@ltantony.mysql.com
9341a2b373 Merge ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0 
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.1
 2005-05-08 01:49:40 +01:00
antony@ltantony.mysql.com
4c3d1f16b9 Merge ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1 
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0
 2005-05-08 01:20:47 +01:00
antony@ltantony.mysql.com
9eaf381d03 FreeBSD doesn't have /proc/cpuinfo, use sysctl to find cpu model. 2005-05-08 01:18:19 +01:00
joerg@trift-lap.fambruehe
84af50133b Corrections to test "sp", stored procedure "fib" (see entry 9937 in the bug DB). 2005-05-07 18:06:02 +02:00
jimw@mysql.com
17b6789cf2 Merge 2005-05-07 08:35:55 -07:00
gbichot@production.mysql.com
a1948f769c [backport of 4.1, because 4.0 autobuild now hits the same problem; 
when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
 2005-05-07 11:35:14 +02:00
antony@ltantony.mysql.com
521b0b6d76 Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1 
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
 2005-05-07 08:46:42 +01:00
antony@ltantony.mysql.com
67bcc9707f Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616 
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
 2005-05-06 16:16:05 +01:00
antony@ltantony.mysql.com
bf17b75a28 Bug#6616 
MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT
  Infinite loop caused by missing update to thd version.
 2005-05-06 14:42:28 +01:00
rburnett@bk-internal.mysql.com
ad6de2c05a Merge bk-internal.mysql.com:/users/rburnett/bug9721 
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
 2005-05-06 15:15:48 +02:00
rburnett@bk-internal.mysql.com
c95e33fadf Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into bk-internal.mysql.com:/users/rburnett/bug9721
 2005-05-06 15:10:01 +02:00
lars@mysql.com
05cbb3962c Manual merge 5.0->5.1 2005-05-06 15:04:07 +02:00
jani@ibmlab.site
0e91a7131f Merge ibmlab.site:/home/my/bk/mysql-4.1 
into ibmlab.site:/home/my/bk/mysql-5.0
 2005-05-06 13:42:30 +03:00
jani@ibmlab.site
fa25b9b49d A fix for Bug#8467. 2005-05-06 12:18:37 +03:00
bar@mysql.com
b1431c222a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/root/mysql-5.0
 2005-05-06 13:08:28 +05:00
bar@mysql.com
1f14cfcb35 merging cp932 from 4.1 2005-05-06 12:00:25 +05:00