mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-06 11:13:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25045 commits 2860 branches 349 tags 1.6 GiB
Commit graph

25045 commits

Author SHA1 Message Date
jimw@mysql.com
42b5135c84 Merge mysql.com:/home/jimw/my/mysql-5.0-11568 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-02 16:50:11 -07:00
jimw@mysql.com
698f209917 Fix test to avoid spurious failure message. (Bug ) 2005-08-02 16:50:10 -07:00
jimw@mysql.com
97797d91fb Merge mysql.com:/home/jimw/my/mysql-5.0-7003 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-02 16:50:09 -07:00
igor@rurik.mysql.com
2b70615913 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-02 16:50:08 -07:00
reggie@fedora.(none)
316eff7a8e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  fedora.(none):/home/reggie/bk/mysql-5.0
 2005-08-02 18:50:07 -05:00
reggie@fedora.(none)
5a0250c349 Conversions of dsp files to vcproj. These files are compatible with 
Visual Studio 2003.  I have not yet changed the windows build scripts
to use these.
 2005-08-02 18:47:02 -05:00
jimw@mysql.com
71a0d0ad4c Make lowercase_table3 get skipped on Windows, as intended. (Bug ) 2005-08-02 15:58:41 -07:00
reggie@fedora.(none)
3beab00b21 fix VC compile error 2005-08-02 17:25:40 -05:00
igor@rurik.mysql.com
7322441dc7 Manual merge 2005-08-02 13:17:49 -07:00
igor@rurik.mysql.com
5e851429de item_sum.cc: 
Reversed the changes to fix bug  after review
  done by SergeyG. Applied a fix suggested by him.
  Added my comment.
 2005-08-02 13:12:41 -07:00
igor@rurik.mysql.com
b5f33d2bc4 Manual merge 2005-08-02 12:09:49 -07:00
igor@rurik.mysql.com
8420d76f8d sql_select.cc, sql_class.h: 
Reversed the changes to fix bug  after review
  done by SergeyG. Applied a fix suggested by him.
 2005-08-02 11:58:52 -07:00
lenz@mysql.com
1e2e10afac Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-08-02 14:16:09 +02:00
lenz@mysql.com
2889025acc Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0-build
 2005-08-02 14:04:21 +02:00
lenz@mysql.com
9217c90a77 - Fixed the Requires: tag for the server RPM (BUG#12233), make sure to list all 
required commands/packages so the installation succeeds. Removed the superflouus
  Requires field from the source RPM.
 2005-08-02 13:59:02 +02:00
svoj@mysql.com
007de019ce Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/svoj/devel/mysql/BUG12075/mysql-4.1
 2005-08-02 14:28:30 +05:00
svoj@mysql.com
315e4efc3f Fix for BUG#12075. 
FULLTEXT non-functional for big5 strings
 2005-08-02 14:27:52 +05:00
svoj@mysql.com
a4d6113d22 After merge fix. 2005-08-02 12:57:26 +05:00
svoj@mysql.com
0f98bf44ef Merge mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.0 
into  mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.1
 2005-08-02 12:12:37 +05:00
svoj@mysql.com
19fe33e16c BUG#11684 fix. 
Repair crashes mysql when table has fulltext index.
 2005-08-02 11:33:26 +05:00
jimw@mysql.com
fb903c1e2c Fix two test results that were merged out-of-order. 2005-08-01 19:21:56 -07:00
jimw@mysql.com
48d111c8c2 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-01 17:54:57 -07:00
jimw@mysql.com
ca56883011 Merge mysql.com:/home/jimw/my/mysql-4.1-9947 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-01 17:12:30 -07:00
jimw@mysql.com
c3e40306b7 Merge mysql.com:/home/jimw/my/mysql-4.1-11402 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-01 17:11:49 -07:00
jimw@mysql.com
9a5560683f Merge mysql.com:/home/jimw/my/mysql-4.1-10724 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-01 17:10:35 -07:00
jimw@mysql.com
8d591d0189 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-01 17:08:38 -07:00
jimw@mysql.com
4cf8696eae Fix crash in 'INSERT DELAYED' statement that failed due to a 
conflict in a unique key. (Bug )
 2005-08-01 17:00:03 -07:00
jimw@mysql.com
ea7df08c93 Fix crash in 'SHOW CREATE FUNCTION' introduced by Monty's last 
cleanup.
 2005-08-01 15:43:40 -07:00
reggie@fedora.(none)
25e204debb fix compile warning in Visual Studio 2003 2005-08-01 17:07:19 -05:00
sasha@asksasha.com
3055ce9ecc Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
 2005-08-01 13:34:04 -06:00
mskold@mysql.com
5d3b406799 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-08-01 12:05:52 +02:00
mskold@mysql.com
cc62018ff6 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-release 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-08-01 11:52:07 +02:00
mskold@mysql.com
0f0fb8a05a Fixed handling of NOT LIKE after Item_func::NOTLIKE_FUNC has been removed 2005-08-01 11:50:43 +02:00
schwenke@alpha.xl.local
655a86a9e7 Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0
 2005-08-01 08:34:29 +02:00
monty@mishka.local
7f845036c0 After merge fixes 
Review of new pushed code
 2005-07-31 22:56:24 +03:00
mskold@mysql.com
d969a9ab68 Fix for bug#12021 2005-07-31 21:33:46 +02:00
monty@mishka.local
585da2f6fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-31 21:09:18 +03:00
schwenke@alpha.xl.local
84c5ce61c5 Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0
 2005-07-31 19:59:20 +02:00
igor@rurik.mysql.com
da33db7558 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-07-31 04:33:15 -07:00
igor@rurik.mysql.com
9ee6e8c147 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-07-31 04:29:34 -07:00
igor@rurik.mysql.com
620f865cbb null_key.result, null_key.test: 
Modified test case for bug .
 2005-07-31 04:28:01 -07:00
monty@mishka.local
e73d6c25fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-31 12:56:02 +03:00
monty@mishka.local
8437e9c1be Fixes during review of new pushed code 
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
 2005-07-31 12:49:55 +03:00
igor@rurik.mysql.com
f4c1b3bae4 Merge 2005-07-31 02:44:18 -07:00
igor@rurik.mysql.com
f8375c6cb3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-07-31 02:36:21 -07:00
igor@rurik.mysql.com
fea0fb2c8b Fixed bug : a join query with GROUP_CONCAT over a single row table. 
If GROUP_CONCAT is calculated we always put its argument into a temp
table, even when the argument is a constant item.
 2005-07-31 02:32:33 -07:00
igor@rurik.mysql.com
37212c07ad Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-07-31 00:39:34 -07:00
bell@sanja.is.com.ua
fddd143b3a Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
 2005-07-30 09:27:00 +03:00
bell@sanja.is.com.ua
ec3396aab3 postmerge-fix 2005-07-30 09:24:51 +03:00
sasha@asksasha.com
fa7897c62a updates for BUG#10780 - fixed slave I/O thread running status to No while attempting 
to connect
 2005-07-29 21:00:28 -06:00