mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25269 commits 2789 branches 343 tags 1.7 GiB
Commit graph

25269 commits

This branch
This branch
All branches
Author SHA1 Message Date
sergefp@mysql.com
c3bac658be Manual merge 2005-08-07 11:03:54 +00:00
acurtis@xiphis.org
015447b211 Bug#10109 
"INSERT .. SELECT ... ON DUPLICATE KEY UPDATE fails"
  Ensure that check_insert_fields() is only called once when
  doing an INSERT..SELECT
 2005-08-07 03:16:15 +01:00
sergefp@mysql.com
5e9545d4c4 BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error): 
When creating temporary table for UNION, pass TMP_TABLE_FORCE_MYISAM flag to 
create_tmp_table if we will be using fulltext function(s) when reading from the 
temp. table.
 2005-08-06 21:08:28 +00:00
kent@mysql.com
b76cea46e9 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-06 18:21:36 +02:00
kent@mysql.com
44b4c0365f Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-08-06 03:31:01 +02:00
kent@mysql.com
94722a3801 make_win_src_distribution.sh: 
Added missing backslashes
 2005-08-06 03:10:35 +02:00
jimw@mysql.com
268a68ad08 Fix error message when creating a non-string field with a display 
width beyond the maximum. (Bug #6080)
 2005-08-05 17:22:53 -07:00
igor@rurik.mysql.com
26e4741dc3 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-05 16:49:16 -07:00
igor@rurik.mysql.com
73db3fdf46 mysql_priv.h: 
Fixed bug #12154: a query returned: Column <name> cannot be null.
  The problem was due to a bug in the function setup_table_map:
  the flag maybe_null was set up incorrectly for inner tables of
  nested outer joins.
join_nested.result, join_nested.test:
  Added a test case for bug #12154.
 2005-08-05 16:43:35 -07:00
jimw@mysql.com
47a6320657 Always report row type of 'Fixed' for MEMORY tables. (Bug #3094) 2005-08-05 13:19:48 -07:00
joerg@mysql.com
9959482c95 Ensure version is 5.0.12 (block the clone's "11" from the main tree). 2005-08-05 21:13:06 +02:00
joerg@mysql.com
a95b9927c7 Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0 2005-08-05 21:10:45 +02:00
joerg@mysql.com
17f2cc4e87 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into mysql.com:/M50/clone-5.0
 2005-08-05 20:50:56 +02:00
joerg@mysql.com
294aa66d92 New "Instance Manager" code: 
Rename "port.h" to "portability.h" to avoid conflict with system header file name,
and include the file in "Makefile.am".
 2005-08-05 20:44:52 +02:00
kent@mysql.com
bae0050358 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-08-05 19:31:19 +02:00
kent@mysql.com
19ad0933f9 client_priv.h: 
Removed ending comma in enum
Makefile.am:
  config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
ndb_config.cpp:
  Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
 2005-08-05 19:29:13 +02:00
hf@deer.(none)
56b91a8c15 testcase added to fix for bug #12281 (Geometry & trigger crash) 2005-08-05 20:26:55 +05:00
hf@deer.(none)
b2147206ba Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.12281
 2005-08-05 20:21:56 +05:00
hf@deer.(none)
4aeded63fd Fix for bug #12281 (Geometry: crash in trigger) 
Field_geom lack size_of method
 2005-08-05 20:19:51 +05:00
joerg@mysql.com
23603ca7cb Reset the version to 5.0.11 (this is within the updated clone). 2005-08-05 16:35:04 +02:00
petr@mysql.com
ee6109e95f post-review fix 2005-08-05 17:48:37 +04:00
ingo@mysql.com
c9e04f4642 Bug#9459 - deadlock with flush with lock, and lock table write 
Added a check before taking a global read lock if
the own thread has a write locked table.
 2005-08-05 15:37:24 +02:00
petr@mysql.com
21a1f466ba chmod -x new IM files 2005-08-05 17:09:02 +04:00
petr@mysql.com
22ccfb4d67 IM port cleanup 2005-08-05 17:02:06 +04:00
petr@mysql.com
07431723c0 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-08-05 14:53:23 +04:00
petr@mysql.com
a64f264e4b IM port fixes: fix crash on startup, add more error checking, get rid of unnecessary code. 2005-08-05 14:35:30 +04:00
andrey@lmy004.
3a52916436 fix for bug #12315 - SHOW TABLE STATUS FROM information_schema; does not sort tablenames 2005-08-05 11:01:29 +02:00
konstantin@mysql.com
85e9801651 Fix gcc -ansi -pedantic compilation failure. 2005-08-05 11:10:51 +04:00
jimw@mysql.com
995b5dd02d Fix out-of-order results in view results file 2005-08-04 16:33:29 -07:00
patg@krsna.patg.net
518745abd4 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-4.0
 2005-08-04 15:48:01 -07:00
jimw@mysql.com
b0c5b625d1 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-04 14:41:16 -07:00
jimw@mysql.com
2da798c991 Update test results 2005-08-04 14:38:48 -07:00
evgen@moonbone.local
de158e94a0 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/mysql-4.1-bug-12266
 2005-08-05 01:03:21 +04:00
evgen@moonbone.local
1894cff045 Manual merge of #11335 bugfix 2005-08-05 00:34:42 +04:00
jimw@mysql.com
fa94e5389a Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-04 12:49:23 -07:00
jimw@mysql.com
b9da417688 Update test to deal with more relaxed datetime parsing. 2005-08-04 12:45:32 -07:00
jimw@mysql.com
5ad0c87dd0 Merge mysql.com:/home/jimw/my/mysql-4.1-12328 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-04 11:00:07 -07:00
jimw@mysql.com
d0c8e929c8 Merge mysql.com:/home/jimw/my/mysql-4.1-7308 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-04 10:48:53 -07:00
reggie@fedora.(none)
069fb89bb9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  fedora.(none):/home/reggie/bk/im_patch
 2005-08-04 11:03:24 -05:00
reggie@fedora.(none)
d146cc9e2f add support for vcproj and sln files (Visual Studio 2003) 2005-08-04 10:08:55 -05:00
reggie@fedora.(none)
11d3d1a09c Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  fedora.(none):/home/reggie/bk/im_patch
 2005-08-04 10:03:33 -05:00
reggie@fedora.(none)
72c0a021e9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  fedora.(none):/home/reggie/bk/im_patch
 2005-08-04 09:33:44 -05:00
evgen@moonbone.local
697836c77f Fix bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced 
length.

When temporary field created for DATE(LEFT(column,8)) expression, max_length
value is taken from Item_date_typecast, and it is getting it from underlaid
Item_func_left and it's max_length is 8 in given expression. And all this
results in stripping last 2 digits.

To Item_date_typecast class added its own fix_length_and_dec() function 
that sets max_length value to 10, which is proper for DATE field.
 2005-08-04 18:05:33 +04:00
lenz@mysql.com
59cec0635c Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-08-04 15:25:01 +02:00
hf@deer.(none)
570c754993 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-08-04 18:24:18 +05:00
hf@deer.(none)
176bfcab13 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2005-08-04 18:22:53 +05:00
hf@deer.(none)
08302a43c3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.12177
 2005-08-04 18:22:13 +05:00
hf@deer.(none)
442891fc5f Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.12177
 2005-08-04 18:21:38 +05:00
lenz@mysql.com
a6182100f1 - Bumped up version number to 5.0.12-beta to indicate the 5.0.11 release build branchoff 2005-08-04 15:20:03 +02:00
hf@deer.(none)
c097bb3fbb Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.10226
 2005-08-04 18:18:02 +05:00