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

11860 commits

Author SHA1 Message Date
sergefp@mysql.com
6289ba1570 [Patch from Konstantin] Enable InnoDB cursor view functionality. 2005-07-29 00:32:03 +00:00
joerg@mysql.com
967bf6d350 Manual merge of 5.0.10a back to the general tree. 2005-07-28 18:30:54 +02:00
gluh@mysql.com
c878d14933 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-07-28 12:02:42 +05:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
4df1652294 Missing initialisation of table->s->db in lock_table_name 
Bug #12112
 2005-07-27 18:13:48 -04:00
gluh@eagle.intranet.mysql.r18.ru
ef2c7812f3 Fix for bug#12127 triggers do not show in info_schema before they are used if set to the database(2nd version) 
use db name of table which trigger belongs to
  instead of thd->db name during trigger body parsing
 2005-07-27 16:17:05 +05:00
joerg@mysql.com
bcace631ee Fix shortcircuit of 127.0.0.1 -> localhost lookup on little-endian machines. (Bug #11822) 
(Originally:   1.1891 05/07/25 12:07:47 jimw@mysql.com )
 2005-07-27 13:01:48 +02:00
ramil@mysql.com
e43dff67f5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2005-07-27 15:09:06 +05:00
hf@deer.(none)
29cfa64f68 Merging 2005-07-27 14:37:16 +05:00
hf@deer.(none)
faef3a442e Merge deer.(none):/home/hf/work/mysql-4.1.11329 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-07-27 13:02:10 +05:00
hf@deer.(none)
a6a57d061d Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.11329
 2005-07-27 13:00:30 +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
hf@deer.(none)
a776edbed1 Fix for bug #11329 (lowercase_table.test fails) 2005-07-26 20:59:43 +05: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
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
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
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
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
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