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

12098 commits

Author SHA1 Message Date
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
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
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
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
jimw@mysql.com
3409537f2a Don't force column header to @@session.var_name if @@local.var_name 
was used. (Bug #10724)
 2005-07-25 11:25:28 -07:00
ramil@mysql.com
efc8404a40 fix (bug #11964: ALTER TABLE gives wrong error message with sql-mode TRADITIONAL (timestamp)). 2005-07-25 14:36:07 +05: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
hf@deer.(none)
ded44df2b5 Fix for bug #6710 (CREATE FUNCTION fails with 'Unknown error') 2005-07-23 17:21:27 +05: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
jimw@mysql.com
72a6c71d08 Fix value returned from SELECT of unsigned long system 
variables. (Bug #10351)
 2005-07-22 16:18:34 -07: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
jimw@mysql.com
6e955625f6 Merge mysql.com:/home/jimw/my/mysql-5.0-build 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-22 12:36:17 -07:00
jimw@mysql.com
49e5636410 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-22 12:35:15 -07:00
jimw@mysql.com
535ba76b98 Merge mysql.com:/home/jimw/my/mysql-4.1-10407 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-22 11:57:34 -07:00
patg@radha.local
757f94009f removed DBUG code from ha_federated.cc causing windows compile problems. 
This is for the release bk tree, same change as 1.1890, which JimW approved.
 2005-07-22 20:56:08 +02:00
jimw@mysql.com
e26a344d19 Fix calculation for length of LPAD() and RPAD() reported to 
client via mysql_fetch_fields(). (Bug #11311)
 2005-07-22 11:46:29 -07:00
paul@snake-hub.snake.net
3723ea1c67 errmsg.txt: 
Change an ` quote to ' (' is used everywhere else)
  This does not affect any test results.
 2005-07-22 12:46:39 -05:00
georg@lmy002.wdf.sap.corp
36b9af2d02 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-22 15:48:07 +02:00
jan@hundin.mysql.fi
7d5e724c40 Implement MySQL framework to support consistent read views in 
cursors for InnoDB. The idea of the patch is that if MySQL requests
a consistent read view, we open one when open a cursor, set is as the
active view to a transaction when fetch from the cursor, and close
together with cursor close. This patch is associated to bugs #11813, 
#11832, and #11833. Contains after review fixes.
 2005-07-22 14:10:03 +03:00
georg@lmy002.wdf.sap.corp
59ddf61392 fix for bug#8692 2005-07-22 08:11:23 +02:00
jimw@mysql.com
6eae678f56 Fix error message generated when trying to create a table in a 
non-existent database. (Bug #10407)
 2005-07-21 20:08:54 -07:00
stewart@mysql.com
71215f68e5 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  mysql.com:/home/stewart/Documents/MySQL/4.0/main
 2005-07-22 12:52:06 +10:00
stewart@mysql.com
ef29f88c43 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-07-22 12:40:55 +10:00
stewart@mysql.com
49c157d073 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
 2005-07-22 11:32:03 +10:00
gluh@mysql.com
d0086f7db0 Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-07-21 17:55:16 +05:00
stewart@mysql.com
1ca53ebc17 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-07-21 22:54:28 +10:00
bar@mysql.com
6a97af8a02 Bug#11216: 'show character set' describes latin1 incorrectly 
Index.xml:
  Fixing latin1 comment:
  it is actually cp1252, not iso-8859-1
ctype_latin1.result:
  changeing test results accordingly.
ctype-latin1.c:
  Fixed to- and from-Unicode conversion maps
  for better Unicode round trip of undefined
  characters.
 2005-07-21 16:05:19 +05:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
5cdaf46362 Fix merge mistake 2005-07-21 01:38:42 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
6026054ead Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
 2005-07-21 01:29:57 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ac6623f08f Fix merge 2005-07-20 22:30:34 -04:00
pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se
9663b9a974 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
 2005-07-20 21:58:33 -04:00
mronstrom@mysql.com
4cb963439a Bug #10600 After review fixes 2005-07-20 21:19:01 +02:00
jimw@mysql.com
69a3209275 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-20 10:31:33 -07:00
jimw@mysql.com
93ae805db3 Fix date conversion on 32-bit machines. 2005-07-20 10:16:43 -07:00
tomas@poseidon.ndb.mysql.com
6ca09e8b8f Bug #12055 NDB temp tables created by ALTER TABLE are usable 
- do not discover temporary files and make them visible
 2005-07-20 18:40:55 +02:00
konstantin@mysql.com
21957c423e Implement MySQL framework to support consistent read views in 
cursors. This should fix Bug#11813 when InnoDB part is in 
(tested with a draft patch).
The idea of the patch is that if a storage engine supports
consistent read views, we open one when open a cursor,
set is as the active view when fetch from the cursor, and close
together with cursor close.
 2005-07-20 20:02:36 +04:00
konstantin@mysql.com
4570ace8fb Fix warnings/compilation failures reported by Jan Lindstrom 2005-07-20 14:17:06 +04:00
stewart@mysql.com
5b9e8da534 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-07-20 14:04:48 +10:00
jimw@mysql.com
d7fbff3ec5 Merge mysql.com:/home/jimw/my/mysql-5.0-5906 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:34 -07:00
jimw@mysql.com
39efcdcf7c Merge mysql.com:/home/jimw/my/mysql-5.0-11822 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:33 -07:00
jimw@mysql.com
2a06e5756e Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:32 -07:00
evgen@moonbone.local
ef1d27e02a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-11760
 2005-07-20 06:59:31 +04:00
evgen@moonbone.local
6b25219fea Fix bug #11760 Typo in Item_func_add_time::print() results in NULLs returned 
by subtime() in view

Item_func_add_time::print() were printing arg[0] instead of arg[1] which
results in wrongly created view. Functions addtime() and subtime were
affected by this bug.
 2005-07-20 06:55:51 +04:00
jimw@mysql.com
63c6ece728 Cleanups after merge from 4.1. 2005-07-19 16:32:38 -07:00
konstantin@mysql.com
5f5e10ed25 Fix a compilation failure. 2005-07-20 01:17:16 +04:00
elliot@mysql.com
7e4179ea02 ha_ndbcluster.cc: 
BUG#12040 Fixed compile failure by using %p instead of %x to print a pointer in DBUG_PRINT
 2005-07-19 22:04:43 +02:00