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
20588 commits 2791 branches 343 tags 1.7 GiB
Commit graph

4741 commits

Author SHA1 Message Date
ramil@mysql.com
26fa98a2cb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b15558
 2006-06-15 11:15:56 +05:00
tomas@poseidon.ndb.mysql.com
220345d3c8 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-06-14 20:18:01 +02:00
tomas@poseidon.ndb.mysql.com
2fcf737feb Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL 
- make sure to disable bulk insert when check for duplicate key is needed
 2006-06-14 20:16:32 +02:00
mskold@mysql.com
47bb569979 Added order by 2006-06-12 15:35:47 +02:00
mskold@mysql.com
049c3e3f69 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-4.1
 2006-06-12 15:35:46 +02:00
mskold@mysql.com
b89f17912c Added lock test on index scan 2006-06-12 09:28:27 +02:00
kent@mysql.com
3744b46a1d Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/data0/mysqldev/my/mysql-4.1
 2006-06-09 22:42:34 +02:00
mskold@mysql.com
597e1444aa Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked 2006-06-08 16:12:38 +02:00
ramil@mysql.com
fe01874613 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b6880
 2006-06-07 14:40:33 +05:00
ramil@mysql.com
0bdae38efb Fix for bug #6880: LAST_INSERT_ID() within a statement 2006-06-07 14:01:10 +05:00
ramil@mysql.com
19e312af08 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b16546
 2006-06-06 09:10:28 +05:00
mskold@mysql.com
39b50ce0d2 Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table 2006-06-02 07:26:45 +02:00
mskold@mysql.com
f838e8a499 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-4.1
 2006-05-30 13:20:38 +02:00
igor@rurik.mysql.com
6051e0f959 Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX 
refers to a column name.
 2006-05-30 00:08:58 -07:00
igor@rurik.mysql.com
cb4c6a0ded Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2006-05-28 14:23:28 -07:00
aelkin@mysql.com
6119b7136e BUG#14157: utf8 encoding in binlog without set character_set_client 
refining the test case to exclude problems with koi8r on some platforms.
 2006-05-28 19:47:01 +03:00
igor@rurik.mysql.com
377b3e0306 Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX 
refers to a column name.
Added a new error message ER_INDEX_DOES_NOT_EXIST.
 2006-05-27 23:57:33 -07:00
kent@mysql.com
f5a443d283 Merge mysql.com:/data0/mysqldev/my/mysql-4.1.20-release 
into  mysql.com:/data0/mysqldev/my/mysql-4.1
 2006-05-26 18:31:25 +02:00
aelkin@dl145h.mysql.com
ac158d52b9 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  dl145h.mysql.com:/tmp/andrei/4.1-bug14157-utf8_binlog_testcases
 2006-05-24 16:55:04 +02:00
serg@mysql.com
44ec4456b8 Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release 
into  mysql.com:/data0/mysqldev/my/mysql-4.1.20-release
 2006-05-24 14:12:19 +02:00
msvensson@neptunus.(none)
dcf9810cb1 Merge neptunus.(none):/home/msvensson/mysql/bug15328/my41-bug15328 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-05-24 10:16:31 +02:00
kent@mysql.com
97674810b0 don't let bugfix for bug#8303 break the bugfix for bug#8378 
revert the fix for bug#8303
correct the test for bug#8378
 2006-05-24 00:55:53 +02:00
ramil@mysql.com
71c035fafb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b18536
 2006-05-22 11:49:35 +05:00
holyfoot@mysql.com
00f3ca8d27 Merge bk@192.168.21.1:mysql-4.1 
into mysql.com:/home/hf/work/mysql-4.1.clean
 2006-05-21 18:19:51 +05:00
aelkin@mysql.com
4d512f3854 #14157: utf8 encoding in binlog without set character_set_client 
fixing an issue with the test portability.
 2006-05-20 12:34:56 +03:00
ramil@mysql.com
13baf7575f Fix for bug #18536: mysqldump does not maintain table orders as per --tables option 2006-05-19 16:21:32 +05:00
ramil@mysql.com
c583de95f8 Fix for bug #15558: truncate doesn't clear table on archive storage engine tables. 2006-05-18 17:10:58 +05:00
tulin@production.mysql.com
4d0169c6f6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/tulin/mysql-4.1
 2006-05-16 21:46:52 +02:00
aelkin@mysql.com
713d17d5e7 BUG#14157: utf8 encoding in binlog without set character_set_client: e.g DROP temporary 
fixing encoding example because of table names can not be in koi8r 
on some platforms.
 2006-05-16 16:50:05 +03:00
tomas@poseidon.ndb.mysql.com
a5686c3138 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-05-16 12:32:36 +02:00
tomas@poseidon.ndb.mysql.com
fe9934c9fe Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail 
- invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
- add check for correct frm on external lock when table cache is found invalid
 2006-05-15 16:23:59 +02:00
aelkin@mysql.com
ab440799e1 BUG#14157: utf8 encoding in binlog without set character_set_client 
fixing names length. Got an issue when merged to 5.0, decided to fix starting from 4.1
 2006-05-14 20:09:09 +03:00
holyfoot@deer.(none)
b457eaba71 bug 15430 (init_connect test fails with the embedded server) 
mysqltest program should be really multithreaded to perform this
test with the embedded server. So this test disabled until we
redo mysqltest this way
 2006-05-14 21:49:33 +05:00
holyfoot@deer.(none)
447e9f019f bug #15435 (wait_timeout.test fails with the embedded server) 
this test just can't work in the embedded server
 2006-05-14 21:43:22 +05:00
aelkin@mysql.com
27696712ef BUG#14157: utf8 encoding in binlog without set character_set_client 
fixing a path to find charset by $MYSQL client. I believe the fix is done what should be
by default.
 2006-05-13 12:14:20 +03:00
aelkin@mysql.com
a0b4c8ed12 Merge mysql.com:/net/nb/home/elkin/MySQL/FIXES/4.1-bug19188_tmp_name 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/4.1
 2006-05-12 21:38:41 +03:00
aelkin@mysql.com
0cec36305b Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/4.1-bug14157-utf8_binlog 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/4.1
 2006-05-12 21:33:24 +03:00
aelkin@mysql.com
9b16a7b91a BUG#19188: incorrect temporary table name of DROP query in replication 
A pattern to generate binlog for DROPped temp table in close_temporary_tables
  was buggy: could not deal with a grave-accent-in-name table.

  The fix exploits `append_identifier()' for quoting and duplicating accents.
 2006-05-12 21:29:06 +03:00
mskold@mysql.com
4efdebeddf Merge mysql.com:/home/marty/MySQL/mysql-4.1_old 
into  mysql.com:/home/marty/MySQL/mysql-4.1
 2006-05-12 10:21:17 +02:00
msvensson@neptunus.(none)
22ff4c2865 Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence 
- Check that length of value is longer than 1 before decrementing length by 2.
 - Backport from 5.0, make it possible to use my_print_defaults in tests
 2006-05-11 14:13:14 +02:00
tnurnberg@mysql.com
133a5d17f7 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/mysql-4.1-10418
 2006-05-11 12:48:49 +02:00
ramil@mysql.com
cf0fc729f8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b18501
 2006-05-10 13:27:48 +05:00
aelkin@mysql.com
226d978ae8 BUG#14157: utf8 encoding in binlog without set character_set_client e.g DROP temporary 
Binlog lacks encoding info about DROPped temporary table.

Idea of the fix is to switch temporary to system_charset_info when a temporary table
is DROPped for binlog. Since that is the server, that automatically, but not the client, who generates the query
the binlog should be updated on the server's encoding for the coming DROP.
The `write_binlog_with_system_charset()' is introduced to replace similar problematic places in the code.
 2006-05-09 23:01:31 +03:00
tnurnberg@mysql.com
21f4e8aadb Bug#10418: LOAD_FILE does not behave like in manual if file does not exist 
load_file() string-function should return NULL rather than throw an error if
the file doesn't exist, as per the manual.
 2006-05-08 04:37:58 +02:00
igor@rurik.mysql.com
0928ae9bf4 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  rurik.mysql.com:/home/igor/mysql-4.1
 2006-05-07 11:25:33 -07:00
aelkin@mysql.com
7dcd1383a8 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/4.1-bug19136_unass_user_var
 2006-05-07 11:43:27 +03:00
igor@rurik.mysql.com
7977a0c867 Fixed bug #14927. 
A query with a group by and having clauses could return a wrong
result set if the having condition contained a constant conjunct 
evaluated to FALSE.
It happened because the pushdown condition for table with
grouping columns lost its constant conjuncts.
Pushdown conditions are always built by the function make_cond_for_table
that ignores constant conjuncts. This is apparently not correct when
constant false conjuncts are present.
 2006-05-06 23:48:13 -07:00
sergefp@mysql.com
ceef1105b2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug16798
 2006-05-06 22:15:27 +04:00
kroki@mysql.com
bf9ccde948 Fix race condition in the test for bug#16501. 2006-05-06 18:24:41 +04:00
sergefp@mysql.com
cef2f703bf Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug16798
 2006-05-06 13:48:20 +04:00