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

4453 commits

Author SHA1 Message Date
lars@mysql.com
6a91b15b8e Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
 2005-09-01 19:03:09 +02:00
jimw@mysql.com
0ebf1576dc Merge mysql.com:/home/jimw/my/mysql-4.1-12325 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-31 18:32:45 -07:00
jimw@mysql.com
00b17c1c17 Fix handling of filenames that start the same as reserved filenames 
on Windows. (Bug #12325)
 2005-08-31 18:32:15 -07:00
lars@mysql.com
7fd89c85b7 BUG#12542: All set statements should be executed by slave thd 
rpl_replicate_do.result:
  New test case
sql_parse.cc:
  All SET statements should be executed by slave thd
rpl_replicate_do.test:
  New test case
 2005-08-31 18:08:45 +02:00
evgen@moonbone.local
f1fb30a15f Fix bug #12861 client hang with group_concat insubquery FROM DUAL. 
Item_func_group_concat::fix_fields() set maybe_null flag to 0, and set it to
1 only if some of it's arguments may be null. When used in subquery in tmp 
table created field which can't be null. When no data retireved result field
have to be set to null and error mentioned in bug report occurs. Also this 
bug can occur if selecting from not null field in empty table.

Function group_concat now marked maybe_null from the very beginning not only
if some of it's argument may be null.
 2005-08-31 18:26:50 +04:00
evgen@moonbone.local
6ed7255448 manual merge of bug fix#12537 2005-08-30 23:29:47 +04:00
brian@zim.(none)
16e30aaf68 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zim.(none):/home/brian/mysql/mysql-4.1
 2005-08-30 08:28:34 -07:00
ramil@mysql.com
dba11de02a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b9613
 2005-08-30 17:32:53 +05:00
evgen@moonbone.local
d76f9471cb Fix bug #12537 UNION produces longtext instead of varchar 
Item::tmp_table_field_from_field_type() and create_tmp_field_from_item()
was converting string field to blob depending on byte-wise length instead of
character length, which results in converting valid varchar string with
length == 86 to longtext.

Made that functions above take into account max width of character when
converting string fields to blobs.
 2005-08-30 16:19:53 +04:00
ramil@mysql.com
00e066e201 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b9613
 2005-08-30 12:33:58 +05:00
brian@zim.(none)
ab126a8130 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zim.(none):/home/brian/mysql/mysql-4.1
 2005-08-29 17:41:09 -07:00
brian@zim.(none)
4e9931752e Added support for delete_all_rows() for archive. This fixes bug #12836. 2005-08-29 15:05:16 -07:00
ingo@mysql.com
ae7e8b1de6 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-08-29 21:10:25 +02:00
ingo@mysql.com
330eb04536 Bug#12296 - CHECKSUM TABLE reports 0 for the table 
Skipping deleted records instead of breaking the loop
during checksum calculation.
 2005-08-29 17:08:41 +02:00
ingo@mysql.com
32e3238da7 Bug#11816 - Truncate table doesn't work with temporary innodb tables 
Handle temporary tables like permanent tables: If the storage engine
cannot truncate, delete instead.
 2005-08-29 17:01:46 +02:00
ingo@mysql.com
674f8dfa7c Bug#11493 - Alter table rename to default database does not work without db name qualifying 
Supplied the default database name for ALTER TABLE ... RENAME 
for the new table instead of the old tables db like we do for 
other ALTERs.
 2005-08-29 16:54:33 +02:00
ingo@mysql.com
5c14b35a7f Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table 
Changed end-space comparison so that the key is not used past
its end. This is due to the new end-space behaviour in 4.1.
See also bug 6151 and 9188.
 2005-08-29 16:50:09 +02:00
bar@mysql.com
96e0cb8cbf ctype_utf8.result, ctype_utf8.test, item.cc: 
Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
 2005-08-29 16:49:01 +05:00
bar@mysql.com
be470c38c6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12371
 2005-08-29 15:44:49 +05:00
hf@deer.(none)
5b35789d12 Merge deer.(none):/home/hf/work/mysql-4.1.9645 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2005-08-27 18:06:09 +05:00
ramil@mysql.com
120dd92b03 workaround (bug #9613: Some read-only variables are selectable, others are not). 2005-08-26 13:23:32 +05:00
serg@sergbook.mysql.com
714b27c71c merged 2005-08-25 00:08:02 +04:00
monty@mishka.local
17654cd7af Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-08-24 20:55:54 +03:00
monty@mishka.local
842de6ea45 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-08-24 19:53:40 +03:00
monty@mishka.local
8e6aa0e7ea Review fixes 2005-08-24 19:37:27 +03:00
jimw@mysql.com
006e5b770b Merge mysql.com:/home/jimw/my/mysql-4.1-12302 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-24 08:50:12 -07:00
heikki@hundin.mysql.fi
4bedb3091c subselect2.result: 
Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different
 2005-08-24 18:05:54 +03:00
serg@sergbook.mysql.com
1fbb96ea97 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2005-08-23 14:16:17 +04:00
jimw@mysql.com
f70beef6c7 Use the hostname with which the user authenticated when determining which 
user to update with 'SET PASSWORD = ...'. (Bug #12302)
 2005-08-22 15:48:50 -07:00
hf@deer.(none)
bded7c984b Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.9645
 2005-08-22 18:24:17 +05:00
serg@sergbook.mysql.com
eadb86d56f after pull cleanup 2005-08-22 13:20:02 +04:00
hf@deer.(none)
45b07fd422 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.9645
 2005-08-22 13:08:44 +05:00
jonas@eel.(none)
a58c0e7dae Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-21 16:35:27 +02:00
elliot@mysql.com
d9e3ad09e5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
 2005-08-20 22:33:45 -04:00
sasha@asksasha.com
e038bfe8ff Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
 2005-08-20 16:09:59 -06:00
elliot@mysql.com
bbbb56df8f Fix ctype_cp932 test to be deterministic on different machines. 2005-08-19 17:55:28 -04:00
igor@rurik.mysql.com
55fd68ccd7 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-08-19 12:10:34 -07:00
elliot@mysql.com
d9efe655ed Bug#11338 Fixes from review (identical functionality). 2005-08-19 14:49:34 -04:00
igor@rurik.mysql.com
2d32b77693 distinct.test, distinct.result: 
Added test cases for bug #12625.
sql_select.cc:
  Fixed bug #12625.
  Fixed invalid removal of constant items from the DISTINCT
  list in the function create_distinct_group.
 2005-08-19 01:57:22 -07:00
sasha@asksasha.com
c594ab7921 updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication). 
We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's 
suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and 
logging now is done in batches - new batch is started if the buffer becomes full.
Reduced memory usage by reusing the table list instead of accumulating a list of 
dropped table names. Also fixed the problem if the table was not actually dropped, eg
due to permissions. Extended the test case to make sure batched query 
logging does work.
 2005-08-18 21:40:14 -06:00
jonas@eel.(none)
96f719818c Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-08-18 14:07:31 +02:00
jonas@eel.(none)
3b68047235 bug#12118 - ndb alter table data loss 
Split table version into 2 (major, minor)
  Impl. signaling to API when table has been altered
  Allow running transactions to use any minor number for transactions
 2005-08-18 14:02:25 +02:00
sasha@asksasha.com
76a59be6fb Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
 2005-08-17 12:39:30 -06:00
igor@rurik.mysql.com
d553e16518 subselect.result: 
Added missing drop statement
subselect.test:
  Added missing drop statement.
 2005-08-15 21:43:46 -07:00
igor@rurik.mysql.com
9693dc6a6b sql_select.cc: 
Fixed bug #11479.
  The JOIN::reinit method cannot call setup_tables
  after the optimization phase since this function
  removes some optimization settings for joined
  tables. E.g. it resets values of the null_row flag to 0.
subselect.result, subselect.test:
  Added a test case for bug #11479.
 2005-08-15 21:33:58 -07:00
jimw@mysql.com
cd0f3596be Merge mysql.com:/home/jimw/my/mysql-4.1-11688 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-15 10:18:14 -07:00
bell@50.0.168.192.in-addr.arpa
8d7a364074 Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 
into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
 2005-08-13 07:49:22 +03:00
bell@50.0.168.192.in-addr.arpa
c96bedb745 Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 
into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
 2005-08-13 07:46:06 +03:00
bell@50.0.168.192.in-addr.arpa
1e248ceaf1 fixed convertion and handling IN subqueries with rows (BUG#11867) 2005-08-13 07:45:14 +03:00
bar@mysql.com
fd7ad7f16f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12351
 2005-08-12 15:44:03 +05:00