mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24492 commits 2784 branches 343 tags 1.6 GiB
Commit graph

24492 commits

This branch
This branch
All branches
Author SHA1 Message Date
lars@mysql.com
6db2602ad0 Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-13 02:13:04 +02:00
lars@mysql.com
f19814bea6 Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-12 19:44:34 +02:00
igor@igor-inspiron.creware.com
4ffd18b4f2 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/mysql-5.0
 2005-07-12 10:44:33 -07:00
igor@igor-inspiron.creware.com
db28fb113e view.test, view.result: 
Expanded the test case for bug #6120 to cover
  DROP VIEW / CREATE VIEW scenario.
sql_view.cc:
  Expanded the fix for bug #6120 to cover the case of
  DROP VIEW / CREATE_VIEW.
 2005-07-12 10:44:32 -07:00
joerg@mysql.com
e06e06ffeb Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-07-12 19:44:32 +02:00
igor@igor-inspiron.creware.com
7725eb3141 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/mysql-5.0
 2005-07-12 10:44:31 -07:00
joerg@mysql.com
58f12166e6 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-07-12 19:44:31 +02:00
sergefp@mysql.com
83b84bc393 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug11821-merge
 2005-07-12 17:44:30 +00:00
sergefp@mysql.com
32a4e52d97 Fix for BUG#11821 manually merged 2005-07-12 17:11:24 +00:00
evgen@moonbone.local
7d20cad2db Merge 2005-07-12 20:49:43 +04:00
evgen@moonbone.local
dc5949b336 Fix bug #11399 Column alias was lost during view preraration. 
New item created in find_field_in_table() to fix view's item, was created 
without taking into account original item's alias. This patch checks if alias 
is set to the original item and if so sets it to newly created item.
 2005-07-12 20:45:34 +04:00
reggie@linux.site
c31d71c065 Fixed some vio code that was using ___WIN__ instead of __WIN__ 2005-07-12 10:31:09 -06:00
jimw@mysql.com
25deb84c0a Merge mysql.com:/home/jimw/my/mysql-4.1-11844 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-12 09:31:08 -07:00
jimw@mysql.com
60368919f9 Merge mysql.com:/home/jimw/my/mysql-4.1-11643 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-12 09:31:07 -07:00
lars@mysql.com
a2ed7cb257 Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/b6987-mysql-4.1
 2005-07-12 18:31:06 +02:00
joerg@mysql.com
c208abe705 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-07-12 18:31:05 +02:00
lars@mysql.com
7d78f53e1c Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/b6987-mysql-4.1
 2005-07-12 18:31:05 +02:00
sergefp@mysql.com
670428f6e6 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug11821
 2005-07-12 16:31:04 +00:00
sergefp@mysql.com
55e70fd1f6 Fix for BUG#11821: Make Item_type_holder be able to work with MIN(field), 
MAX(field).
 2005-07-12 16:30:45 +00:00
igor@igor-inspiron.creware.com
a0f594a8ef Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/mysql-5.0
 2005-07-12 05:31:06 -07:00
lars@mysql.com
df55465bdc Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-12 14:23:54 +02:00
igor@igor-inspiron.creware.com
26ee0b2ef8 view.result, view.test: 
Added a test case for bug #11771.
item.h:
  Fixed bug #11771.
  Added method reset_query_id_processor to be able to adjust
  query_id for fields generated from * in queries like this:
  SELECT * FROM <view> ...
sql_base.cc:
  Fixed bug #11771.
  Adjusted query_id for fields generated from * in queries
  like this: SELECT * FROM <view> ...
 2005-07-12 05:18:05 -07:00
lars@mysql.com
bdf0a22c71 Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/b6987-mysql-4.1
 2005-07-12 14:17:23 +02:00
lars@mysql.com
ef1edc9d79 Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-12 13:36:21 +02:00
hf@deer.(none)
64c2a598b6 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-07-12 16:02:35 +05:00
mskold@mysql.com
60bb14c3ef Fixed failed merge 2005-07-12 11:49:57 +02:00
mskold@mysql.com
2dd4dd9291 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-12 11:46:53 +02:00
hf@deer.(none)
ba559d651e Fix for bug #11557 (Error during rounding of the DEFAULT values) 2005-07-12 14:17:59 +05:00
joerg@mysql.com
8014606e19 Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0 2005-07-12 11:10:33 +02:00
georg@lmy002.wdf.sap.corp
4f641c0443 Merge grichter@bk-internal1.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-07-12 11:00:01 +02:00
georg@lmy002.wdf.sap.corp
55d413252f changes after Bar's review: renamed CHARACTER_SET to MY_CHARSET_INFO 2005-07-12 10:58:21 +02:00
mskold@mysql.com
f741566646 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-12 10:57:01 +02:00
mskold@mysql.com
d71548c873 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-07-12 10:50:47 +02:00
mskold@mysql.com
c37aece470 Disabled internal ndb system table test, since it only works on case sensitive systems 2005-07-12 10:39:58 +02:00
georg@lmy002.wdf.sap.corp
ceba4ee9cd New attempt after Bar's review 
Added api function mysql_get_character_set_info which provides
information about the current client character set.
 2005-07-12 10:31:43 +02:00
bar@mysql.com
2204effda1 Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-12 13:18:25 +05:00
stewart@mysql.com
6955f0e76b Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-07-12 15:51:31 +10:00
lars@mysql.com
dc55af92ff BUG#6987: Added note when stat is failing on relay log, added mutex for log rotatation. 2005-07-12 06:01:26 +02:00
lars@mysql.com
0b77c0f784 Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-12 03:23:52 +02:00
brian@avenger.(none)
0c5ac2dd5b Fix for gcc 4.0 (they have removed min/max operators). 2005-07-11 16:56:18 -07:00
jimw@mysql.com
7ae4a6043c Apply security patch to bundled zlib for CAN-2005-2096. (Bug #11844) 2005-07-11 10:37:21 -07:00
pem@mysql.com
8e7951a1c4 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-11 19:11:52 +02:00
pem@mysql.com
ee81c73a0d Post-review fix. 2005-07-11 19:10:51 +02:00
reggie@linux.site
48d8d8afe3 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  linux.site:/home/reggie/bk/mysql-5.0
 2005-07-11 11:01:14 -06:00
pem@mysql.com
b268a17866 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-11 19:01:14 +02:00
brian@brian-akers-computer.local
f860743486 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into brian-akers-computer.local:/Users/brian/mysql/comment-5.0
 2005-07-11 10:01:13 -07:00
brian@brian-akers-computer.local
4d68f5d070 Added a test for glibtoolize so that the autoconf tools that come installed on OSX will work fine (so no need to replace them). 2005-07-11 09:52:19 -07:00
joerg@mysql.com
e3feff334f cmd-line-utils/libedit/chared.c: Fix compile problem caused by use of "uint" which is undefined on QNX. 2005-07-11 15:59:49 +02:00
pem@mysql.com
65fa6604f0 Updated system_mysql_db.result after mysql.proc definition changes. 2005-07-11 15:57:46 +02:00
reggie@linux.site
7de0a01800 ha_archive.cc: 
Added cast to fix windows compile error
 2005-07-11 06:14:42 -06:00