1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Commit Graph

5779 Commits

Author SHA1 Message Date
jimw@mysql.com
b5c01d7971 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 14:36:07 -07:00
evgen@moonbone.local
6ed7255448 manual merge of bug fix#12537 2005-08-30 23:29:47 +04:00
jimw@mysql.com
0dc444ec4e Fix incorrect spellings of "dropped" in source and tests. (Bug #12828) 2005-08-30 12:24:37 -07: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
SergeyV@selena.
e0e235c322 Fixes bug #12517. Clear user variables and replication events before
closing temp tables in thread cleanup.
2005-08-30 17:22:19 +04: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
bar@mysql.com
3ff1acb8db Bug#12363
character_set_results is nullable, but value_ptr returns string "NULL"

set_var.cc:
  Create Item_null instead of Item_string for NULL values

variables.result, variables.test:
  adding test case
2005-08-30 17:11:59 +05:00
bar@mysql.com
98581508c3 Bug #12829
Cannot convert the charset of a GROUP_CONCAT result:

item_sum.cc:
  "result" character set was not set into proper value.

func_gconcat.result, func_gconcat.test:
  Fixing tests accordingly.
2005-08-30 15:36:47 +05: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
paul@snake-hub.snake.net
c0ae75c5d3 fulltext_var.result:
Update test result.
2005-08-29 22:35:48 -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
monty@mishka.mysql.com
9605c5dba2 Add back changes lost in merge
(Faster test)
2005-08-25 10:19:06 +03: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
kent@mysql.com
4d2cc6e503 Merge 2005-08-23 18:06:24 +02: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
jonas@eel.(none)
290cfe313c Merge eel.(none):/home/jonas/src/mysql-4.1-push
into  eel.(none):/home/jonas/src/mysql-4.1
2005-08-19 07:51:47 +02:00
jonas@eel.(none)
523039c832 ndb
rename config.cpp -> ndb_config.cpp for case insesitive filesystems
why wasn't this done in 4.1 directly
2005-08-19 07:48:59 +02: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
kent@mysql.com
86e5ddeb52 ps_conv.inc:
Adjustment of float results for Windows
mysql-test-run.pl:
  Added --port to make MYSQL_DUMP and MYSQL_SHOW work on windows
have_lowercase0.inc:
  new file
2005-08-18 22:27:12 +02: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
kent@mysql.com
1476a52433 mtr_timer.pl, mysql-test-run.pl, mtr_report.pl, mtr_process.pl:
Added suite and test case timeout
mtr_timer.pl:
  new file
2005-08-18 00:16:44 +02:00
kent@mysql.com
adb94df296 mtr_process.pl:
Bug#11792: Create a shell like 'mysqltest' exit status
2005-08-18 00:07:17 +02:00