database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-03 05:41:09 +03:00
Code Activity
23,952 Commits 3,301 Branches 1,099 Tags
8018f99ce75b398ee5561ddcec438eb968e69e52
Commit Graph

7145 Commits

Author SHA1 Message Date
msvensson@neptunus.(none)
8018f99ce7 Merging 2005-06-22 20:43:10 +02:00
msvensson@neptunus.(none)
01b025c2d2 Fix so that my_progname is set to "mysqldump" 2005-06-22 20:37:14 +02:00
msvensson@neptunus.(none)
8e9c7a42df Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-06-22 20:24:10 +02:00
msvensson@neptunus.(none)
2dd6a58d58 BUG#9657 mysqldump xml ( -x ) does not format NULL fields correctly 
- Importing the bug fixes by patch due to merge problems.
 2005-06-22 20:22:54 +02:00
msvensson@neptunus.(none)
1199b4ec9d Fix mysqldump for so that my_programname is set to "mysqldump". 
Correct test results now when error message output is predictable.
 2005-06-22 20:12:21 +02:00
msvensson@neptunus.(none)
9258513c1e Bug #9558 mysqldump --no-data db t1 t2 format still dumps data 
- Check the Dflag variable inside of function dump_table to see if data should be
dumped or not.
    - Add test for --xml and --no-data as well
    Reapplying patch!
 2005-06-22 15:43:49 +02:00
msvensson@neptunus.(none)
fd82fd86bc Merge to 5.0 2005-06-22 15:32:05 +02:00
msvensson@neptunus.(none)
94e37bc3fc Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050622121209|37729 2005-06-22 14:16:26 +02:00
msvensson@neptunus.(none)
777e1d785c Should not be changed 2005-06-22 14:12:09 +02:00
msvensson@neptunus.(none)
85b9ffc4ca Merged from mysql-4.1 to mysql-5.0 2005-06-22 14:10:02 +02:00
msvensson@neptunus.(none)
61a3e16bfd Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug10589
 2005-06-22 12:41:33 +02:00
bell@sanja.is.com.ua
53595de2c1 test made independent 2005-06-22 08:52:06 +03:00
bell@sanja.is.com.ua
a4a7735b33 merge 2005-06-22 08:42:03 +03:00
bell@sanja.is.com.ua
ebe9b54871 make test result repeatable 2005-06-22 08:38:28 +03:00
bell@sanja.is.com.ua
f8c237bd4a Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-06-22 03:48:26 +03:00
evgen@moonbone.local
30a0ad3a68 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/work/mysql-5.0-bug-11298
 2005-06-22 04:48:25 +04:00
evgen@moonbone.local
5097c6825e Fix bug#11298 insert into select from VIEW produces incorrect result 
when using ORDER BY

Insert were inserting data from last record fetched instead of inserting from 
temporary table.

Make Item_ref to save data from result_field if it's available rather then
from *ref on save_in_field() call.
 2005-06-22 04:45:10 +04:00
bell@sanja.is.com.ua
a05e50e29e fixed items cleunup for SP (BUG#10136) 2005-06-22 00:17:08 +03:00
bell@sanja.is.com.ua
93d0763b70 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-06-21 20:44:18 +03:00
bell@sanja.is.com.ua
a7ca9cb38e fixed view fields names check and generation (changed after Trudy review: underlying field names treat as user set ones) (BUG#7448) 2005-06-21 20:30:48 +03:00
igor@rurik.mysql.com
a626ab4c96 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-06-21 10:15:22 -07:00
evgen@moonbone.local
e7e5cb29cb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/work/mysql-5.0-bug-7422
 2005-06-21 21:15:20 +04:00
evgen@moonbone.local
e94f16a125 Fix bug #7422 "order by" doesn't work 
Field with wrong buffer was used to make sort key, which results in producing
same sort key for all records.
 2005-06-21 20:14:50 +04:00
igor@rurik.mysql.com
6a721d03d6 group_by.result, group_by.test: 
Correction for the test case of bug #11295 to remove
  warning.
 2005-06-21 08:15:49 -07:00
igor@rurik.mysql.com
295645b688 Manual merge 2005-06-21 06:26:02 -07:00
msvensson@neptunus.(none)
ddeaf342a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-06-21 14:24:13 +02:00
msvensson@neptunus.(none)[msvensson]
39636f48f0 patch 2005-06-21 14:19:56 +02:00
igor@rurik.mysql.com
bb944aa9dc Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
 2005-06-21 04:31:07 -07:00
igor@rurik.mysql.com
2104e9e668 group_by.result, group_by.test: 
Added a test case for bug #11295.
item_buff.cc:
  Fixed bug #11295.
  This a correction for the patch of bug #11088 that takes into
  account a possible NULL values of the BLOB column.
 2005-06-21 04:24:21 -07:00
mskold@mysql.com
2716e772d4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-21 10:35:22 +02:00
mskold@mysql.com
981e845d8f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-06-21 08:59:37 +02:00
marko@hundin.mysql.fi
8934dfaa7b InnoDB: adjust test result 2005-06-21 08:16:36 +03:00
kent@mysql.com
ff20e1c2ca Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-06-21 02:27:55 +02:00
kent@mysql.com
4958b54339 mysql-test-run.pl: 
More compact and safe handling of path names.
  Support for running in Windows source tree.
  Use libtool wrapper, instead of messing with
  library path names, and objects in .libs dir.
mtr_misc.pl:
  Utility function that search aand check path names
mtr_report.pl:
  Patch by Carsten, set correct reject/result/eval if not main suite
 2005-06-21 02:21:52 +02:00
jimw@mysql.com
99e35c84ac Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-20 15:02:45 -07:00
jimw@mysql.com
f36ee2a96d Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-20 14:48:04 -07:00
kent@mysql.com
9c79bc7e73 Merge 2005-06-20 22:31:25 +02:00
kent@mysql.com
9426710c68 mtr_cases.pl: 
Bug#11466: Script can now get test case name
  from test case file path on command line
mysql-test-run.pl:
  Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mtr_cases.pl:
  Don't set --default-time-zone if opt file sets it
  Restart the server if time zone is given in opt file
mysql-test-run.pl:
  Don't remove symlink to "var" directory in cleanup
  Removed duplicate/unessesary options to mysqld
 2005-06-20 21:37:39 +02:00
jimw@mysql.com
27eace6304 Merge jwinstead@production.mysql.com:my/mysql-4.1-7858 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-20 12:04:22 -07:00
igor@rurik.mysql.com
28214f3da8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-20 10:52:38 -07:00
igor@rurik.mysql.com
acc6651d24 group_by.result: 
Added  a test case for bug #11385.
group_by.test:
  Added  a test case for bug #11385.
field.h:
  Fixed bug #11385.
  The bug was due to not defined method decimals for the class
  Field_datetime.
 2005-06-20 10:49:04 -07:00
mskold@mysql.com
91c422e029 Merge 2005-06-20 18:02:47 +02:00
mskold@mysql.com
777ec78755 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-20 16:13:34 +02:00
igor@igor-inspiron.creware.com
7ea12bd787 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into igor-inspiron.creware.com:/home/igor/mysql-4.1
 2005-06-20 06:13:30 -07:00
dlenev@mysql.com
e28264d29f Manual merge of patch for bug#11060 "Server crashes on calling stored 
procedure with INSERT SELECT UNION SELECT" aka "Server crashes on
re-execution of prepared INSERT ... SELECT with UNION" into 5.0 tree.
 2005-06-20 16:58:02 +04:00
dlenev@mysql.com
b5b3b32d0a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg11060
 2005-06-20 16:07:36 +04:00
dlenev@brandersnatch.localdomain
d07843efd9 Fix for bug #11060 "Server crashes on re-execution of prepared 
INSERT ... SELECT with UNION" (reviewed version).

Altough bug manifest itself only starting from 5.0 it is better to
apply fix to 4.1 to keep some assumptions true and make code more
future-proof.
 2005-06-20 16:07:00 +04:00
bell@sanja.is.com.ua
02cac1c5e6 fixed time_format printing (BUG#7521) 2005-06-20 14:56:17 +03:00
msvensson@neptunus.(none)
73c1578f15 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug10365
 2005-06-20 13:08:45 +02:00
kent@mysql.com
950f36dde6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-06-20 12:36:40 +02:00