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
18735 commits 2781 branches 343 tags 1.6 GiB
Commit graph

18735 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
84e5118931 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-06-23 19:06:35 +02:00
sergefp@mysql.com
009e2457d9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10151
 2005-06-23 19:06:34 +02:00
evgen@moonbone.local
be76efab84 sql_parse.cc: 
Fix for fix for bug #9728
  Error caused server hang on prepared insert ... select
 2005-06-23 21:06:33 +04:00
sergefp@mysql.com
1e7cfe1e21 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10151
 2005-06-23 17:12:04 +02:00
msvensson@neptunus.(none)
62d14e4d06 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-06-23 13:53:59 +02:00
lenz@mysql.com
a5e8bce119 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-06-23 12:03:10 +02:00
lenz@mysql.com
cacb7199d3 - manual merge of the new node names 2005-06-23 11:34:58 +02:00
lenz@mysql.com
03b128971e - fixed text file generation - the node names in the info page had changed 2005-06-23 11:30:40 +02:00
sergefp@mysql.com
fc75403b4d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10151
 2005-06-23 11:03:21 +02:00
msvensson@neptunus.(none)
e929e55fb6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-06-22 20:59:34 +02:00
lars@mysql.com
53761ce08f Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1 2005-06-22 20:59:33 +02:00
sergefp@mysql.com
3196513258 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10151
 2005-06-22 20:59:32 +02:00
reggie@mdk10.(none)
705992719a Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/bug9148
 2005-06-22 13:59:32 -05:00
evgen@moonbone.local
54d3b00184 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/mysql-4.1-bug-8147
 2005-06-22 22:59:31 +04:00
evgen@moonbone.local
6b9df50c5e item.h: 
Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
  Have to return false to set flag for whole expression.
 2005-06-22 22:58:44 +04: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)
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
lars@mysql.com
008548150c BUG#9361: Added test cases 2005-06-22 17:12: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
lenz@mysql.com
819fc8dd1f Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-06-22 12:38:38 +02:00
mskold@mysql.com
18804df51e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-22 11:51:18 +02:00
mskold@mysql.com
c8398bcd2b Made upgrade compatibility in 4.1 range to latest build version 2005-06-22 11:18:40 +02:00
petr@mysql.com
dff36b3e4e fix README file to be more verbose match actual situation (recomitted to push into 4.1) 2005-06-22 05:18:43 +02:00
evgen@moonbone.local
2235ea9593 Fix bug #9728 decreased functionality in "on duplicate key update" 
Remove changes made by bug fix #8147. They strips list of insert_table_list to
only insert table, which results in error reported in bug #9728.
Added flag to Item to resolve ambigous fields reported in bug #8147.
 2005-06-22 07:18:42 +04:00
elliot@mysql.com
a24336cdcb BUG#10442 Minor changes from code review 2005-06-21 15:40:58 -04:00
reggie@mdk10.(none)
93b38c5f67 Bug #9148 Denial of Service 
my_access.c:
  Fixed problem where in some cases check_if_legal_filename was returning 0 for illegal names
 2005-06-21 13:35:12 -05:00
elliot@mysql.com
2eb7301081 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug10442
 2005-06-21 14:28:55 -04:00
kent@mysql.com
26dc9492c3 mysql-test-run.pl: 
Added optional paths for finding mysqld on Windows
  Added language/charset options to embedded mysql_client_test
 2005-06-21 20:25:50 +02:00
evgen@moonbone.local
b625e43485 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  moonbone.local:/work/mysql-4.1-bug-10886
 2005-06-21 22:25:49 +04:00
evgen@moonbone.local
dc381ea960 Fix bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE produces bad results 
Temporary field wasn't restored to default values after ON DUPLICATE KEY
 UPDATE event, which results in wrong data being inserted in new record.
 2005-06-21 22:24:58 +04:00
igor@rurik.mysql.com
3bfe28e9bf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-21 06:19:06 -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
lenz@mysql.com
acbfb38c02 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-06-21 10:37:29 +02: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
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
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
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
kent@mysql.com
c7e501d883 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-06-20 21:25:54 +02:00
jimw@mysql.com
4d6c8d59a9 Merge jwinstead@production.mysql.com:my/mysql-4.1-win 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-20 12:07:41 -07:00
jimw@mysql.com
60aef4ba97 Merge jwinstead@production.mysql.com:my/mysql-4.1-10840 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-20 12:05:09 -07: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
jimw@mysql.com
5381e18673 Fix handling of command-line on Windows, missed as part of earlier 
commit. (Bug #10840)
 2005-06-20 18:54:45 +02:00
kent@mysql.com
fb09633eb1 Makefile.am: 
Corrected dependency for "lex_hash.h", to avoid occasional make failure
 2005-06-20 18:03:30 +02:00
mskold@mysql.com
d34fce5bf6 ha_ndbcluster.cc: 
Added CR for readability
 2005-06-20 17:17:44 +02:00
mskold@mysql.com
e8e6554a22 Added comment to store_lock 2005-06-20 17:16:22 +02:00