mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25191 commits 2791 branches 343 tags 1.7 GiB
Commit graph

25191 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com
c954c09a11 Fixed test that failed on 32 bit systems 2005-08-09 11:21:45 +03:00
heikki@hundin.mysql.fi
10e5ee5196 ha_innodb.cc: 
Add a forgotten newline to a print
 2005-08-08 21:43:08 +03:00
jimw@mysql.com
a17fa23332 Merge mysql.com:/home/jimw/my/mysql-5.0-11570 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-08 11:43:07 -07:00
jimw@mysql.com
253d528b14 Fix error code in some tests because of merge 2005-08-08 11:42:09 -07:00
jimw@mysql.com
4cdca3486d Merge mysql.com:/home/jimw/my/mysql-5.0-6080 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-08 10:12:24 -07:00
jimw@mysql.com
0a7b2963d6 Merge mysql.com:/home/jimw/my/mysql-5.0-3094 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-08 10:10:04 -07:00
konstantin@mysql.com
78482b2616 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kostja/mysql/mysql-5.0-11909
 2005-08-08 19:26:19 +04:00
konstantin@mysql.com
043f77ccdf A fix and a test case for Bug#11909 "mysql_stmt_attr_set 
CURSOR_TYPE_READ_ONLY nested queries corrupt result"
 2005-08-08 19:24:56 +04:00
bar@mysql.com
d7bbabf989 grant.result: 
After merge fix
 2005-08-08 19:04:11 +05:00
bar@mysql.com
27dacdc532 Merge mysql.com:/usr/home/bar/mysql-4.1.b10892 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-08-08 19:04:10 +05:00
sergefp@mysql.com
8e09db01ad Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug12082
 2005-08-08 14:04:09 +00:00
bar@mysql.com
8545cf92d0 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b10892
 2005-08-08 16:22:17 +05:00
bar@mysql.com
2c8fc886b9 item.cc: 
After review fix
 2005-08-08 16:20:46 +05:00
igor@rurik.mysql.com
88d7973da4 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-07 15:56:48 -07:00
ingo@mysql.com
806b5468b8 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-08-08 00:10:07 +02:00
igor@rurik.mysql.com
dafbb34dfe subselect.result: 
Correction after manual merge.
 2005-08-07 15:10:07 -07:00
ingo@mysql.com
b3eed0e49c Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-08-08 00:10:06 +02:00
igor@rurik.mysql.com
c6d1a05aa0 Manual merge 2005-08-07 15:10:06 -07:00
sergefp@mysql.com
e554e61734 Post-merge fixes 2005-08-07 22:10:05 +00:00
sergefp@mysql.com
65566e449d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug11869-part3
 2005-08-07 21:32:26 +00:00
sergefp@mysql.com
0dba629a5e Manual merge 2005-08-07 21:30:46 +00:00
sergefp@mysql.com
d9ce6e8f25 BUG#11869:part 2: post-review fixes: merging into 5.0 
We're out of bits in st_select_lex->options so make TMP_TABLE_FORCE_MYISAM ==
OPTION_FOUND_COMMENT (the latter is not used by create_tmp_table).
 2005-08-07 21:21:30 +00:00
igor@rurik.mysql.com
245b4beb49 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-08-07 14:03:47 -07:00
ingo@mysql.com
fd946d42a8 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-08-07 23:03:46 +02:00
igor@rurik.mysql.com
b2a189ab07 subselect.result: 
Added test case for bug #11867.
  Fixed results for two existing test cases.
subselect.test:
  Added test case for bug #11867.
item_subselect.cc:
  Fixed bug #11867.
  Added missing code in Item_in_subselect::row_value_transformer
  that caused problems for queries with
  ROW(elems) IN (SELECT DISTINCT cols FROM ...).
 2005-08-07 14:03:46 -07:00
sergefp@mysql.com
d820a09a68 BUG#11869: part2: post-review fixes: 
In init_prepare_fake_select_lex() don't empty ftfunc_list. UNION's ORDER BY clause may 
contain MATCH(...), for which fix_index() should be called.
 2005-08-07 21:03:45 +00:00
ingo@mysql.com
1147e00274 Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO 
Give the user a warning if he tries to destroy the default key cache.
 2005-08-07 20:39:17 +02:00
ingo@mysql.com
ec0c854cfa Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-08-07 18:28:08 +02:00
sergefp@mysql.com
047c34e5c8 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug11869-part2
 2005-08-07 11:05:25 +00:00
sergefp@mysql.com
c3bac658be Manual merge 2005-08-07 11:03:54 +00: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