mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12635 commits 2781 branches 343 tags 1.6 GiB
Commit graph

3270 commits

Author SHA1 Message Date
serg@serg.mylan
2cbc4e71fc backport from 4.1: 
"phrase search" should not match partial words (it should not match 'paraphrase searches')
 2004-05-10 12:39:01 +02:00
ingo@mysql.com
4bb5c83a62 Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-bug2831
 2004-05-10 12:36:09 +02:00
ingo@mysql.com
309c7412f6 Fix replace_result of $MASTER_MYPORT instead of literal numbers. 2004-05-10 12:15:40 +02:00
bell@sanja.is.com.ua
d2fa79b291 keep old engine & JOIN if we changed subquery Item (Bug #3646) 2004-05-07 23:06:11 +03:00
magnus@neptunus.(none)
97ffc1f408 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-07 16:21:54 +02:00
marko@hundin.mysql.fi
11f9ec1dc5 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-05-07 12:48:01 +03:00
marko@hundin.mysql.fi
c066b3022e Fix auto_inc locking bug introduced in ChangeSet@1.1794.1.1 2004-05-07 12:13:45 +03:00
monty@mysql.com
939ea71ecd Portability fixes 
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
 2004-05-07 01:43:17 +03:00
bell@sanja.is.com.ua
3aae50e8c0 EXPLAIN UNION using same routing which used for execution which allow return correct bug messages (Bug #3639) 
EXPLAIN of hidden SELECT of UNION
 2004-05-06 20:40:21 +03:00
monty@mysql.com
28673669a4 Merge with 4.0 to get security patch for check_grant_colum 2004-05-06 13:42:26 +03:00
marko@hundin.mysql.fi
007e6210d4 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-05-06 09:53:50 +03:00
monty@mysql.com
f6dc9169e2 Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666) 
The bug was introduced in a patch in the 4.1.2 source tree.
 2004-05-06 04:40:45 +03:00
bell@sanja.is.com.ua
5030d28035 fixed test results 2004-05-05 23:29:35 +03:00
bell@sanja.is.com.ua
ae85306e19 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
 2004-05-05 23:19:13 +03:00
guilhem@mysql.com
cd18476e34 Replication: 
as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
 2004-05-05 22:01:41 +02:00
guilhem@mysql.com
f7f7e725d6 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-05-05 21:51:26 +02:00
guilhem@mysql.com
d20230bcbe very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err, 
and a comment update
 2004-05-05 21:50:51 +02:00
bell@sanja.is.com.ua
26f0825cae merge 2004-05-05 22:30:01 +03:00
monty@mysql.com
4e2b94dea6 After merge fixes 2004-05-05 21:46:16 +03:00
monty@mysql.com
6827fe4086 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-05 21:24:45 +03:00
monty@mysql.com
a5d8b846fa after merge fixes 2004-05-05 21:24:21 +03:00
bell@sanja.is.com.ua
62fca61bc4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
 2004-05-05 21:24:13 +03:00
bell@sanja.is.com.ua
c5c35c667e caching of queries with isammerge tables forbiden using general way 
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update
 2004-05-05 21:21:41 +03:00
monty@mysql.com
d21d49a32a Merge with 4.0.19 2004-05-05 17:05:24 +03:00
magnus@neptunus.(none)
1d8bf1cb18 BUG# 3658 ALTER TABLE corrupts table 
Added  test file for ALTER TABLE, engine = ndbcluster
 2004-05-05 16:04:23 +02:00
marko@hundin.mysql.fi
6a6fa5b388 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-05-05 14:21:42 +03:00
ram@gw.mysql.r18.ru
949c01bfa2 a fix (Bug #3435: STDDEV|VARIANCE(constant) returns constant if no rows) 2004-05-05 16:06:01 +05:00
magnus@neptunus.(none)
6893acc1e8 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-05 12:15:27 +02:00
monty@mysql.com
104fdf607d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-05 12:40:59 +03:00
monty@mysql.com
7e3cf5958c Fixed crashing bug with alter table when table was in use (Bug #3643) 
We didn't use 'only index' for tables of type 'const'. (Bug #3497)
 2004-05-05 12:31:17 +03:00
bell@sanja.is.com.ua
e9492cca05 avoid using ndb tables in query cache 2004-05-05 11:22:10 +03:00
magnus@neptunus.(none)
347dfcd879 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-05 08:55:32 +02:00
Sinisa@sinisa.nasamreza.org
ee627d2510 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-05-04 23:05:37 +03:00
Sinisa@sinisa.nasamreza.org
68cb444c62 Fix for a multi table updates when one of the tables is not updated 
but used in a nested query.
 2004-05-04 23:04:05 +03:00
Sinisa@sinisa.nasamreza.org
b58127689e union.result: 
fixing typo
union.test:
  fixing type
 2004-05-04 16:48:34 +03:00
bell@sanja.is.com.ua
5de8c225e2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
 2004-05-04 15:35:11 +03:00
monty@mysql.com
59ddd8c738 Fix to handle unsigned data in prepared statements (Bug #3447) 
Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404)
Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238)
Don't auto-repair tables in mysqlcheck if table type doesn't support 'check' command.
 2004-05-04 15:02:38 +03:00
Sinisa@sinisa.nasamreza.org
909d69ff0a union.result, union.test: 
a small fix for the test case
 2004-05-04 14:11:23 +03:00
serg@serg.mylan
d8ad1eb1c4 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-05-03 18:23:29 +02:00
Sinisa@sinisa.nasamreza.org
333eadf1b2 Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT 2004-05-03 19:15:26 +03:00
serg@serg.mylan
acb5820f89 per special request from Ingo :) 2004-05-03 17:17:50 +02:00
ingo@mysql.com
c0aad5a1a8 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-wl1700-diff
 2004-05-03 16:15:45 +02:00
ingo@mysql.com
5a78b4c746 WL#1700 - Properly count key_blocks_used and key_blocks_current. 
Introduced a new free blocks list. Free blocks are now re-used before
new blocks are allocated from the pool. There is a new status variable 
which can be queried by "show status like key_blocks_unused".
 2004-05-03 15:55:21 +02:00
serg@serg.mylan
380267859d mysql-test-run: -start-from added, cleanup 2004-05-03 12:10:06 +02:00
marko@hundin.mysql.fi
8ab135a71c Merge marko@build.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/l/mysql-4.0
 2004-05-03 10:43:05 +03:00
marko@hundin.mysql.fi
9efb2853ad Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-05-03 09:45:17 +03:00
bell@sanja.is.com.ua
25d815cde6 fixed zero result case for group functions in subquery (Bug #3505) 
fixed LIMIT 0 for zero rows optimisation
 2004-05-02 13:03:49 +03:00
magnus@neptunus.(none)
c3df24362b Merge neptunus.(none):/home/magnus/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1-sql-bench
 2004-04-30 13:41:19 +02:00
magnus@neptunus.(none)
d4ee7e7e9b Addded test files for NDB 
Updated stop_ndbcluster script
 2004-04-30 12:49:34 +02:00
magnus@neptunus.(none)
08fa382a70 Merge neptunus.(none):/home/magnus/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1-sql-bench
 2004-04-30 12:45:20 +02:00
magnus@neptunus.(none)
122bff3240 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-04-30 12:43:28 +02:00
magnus@neptunus.(none)
ed6148da75 Updated default NDB config to work better with sql-bench 
Updated sql-bench configs to take NDB's limitations into account
 2004-04-30 10:08:44 +02:00
monty@mysql.com
7c742e5583 Portability fixes 2004-04-30 00:14:56 +03:00
marko@hundin.mysql.fi
a490b95b04 InnoDB: implement LOCK TABLE (Bug #3299) 2004-04-29 16:42:33 +03:00
magnus@neptunus.(none)
cfbabb0245 Added new mysql-test files for NDB 2004-04-29 09:58:38 +02:00
guilhem@mysql.com
eff7b259e3 Very small fixes for testsuite (a real_sleep instead of sleep, plus TCP port independency of the result file). 2004-04-28 23:43:46 +02:00
guilhem@mysql.com
e7fbd33acc Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-04-28 18:31:31 +02:00
guilhem@mysql.com
3fc39188ec A new option --replicate-same-server-id to force a slave to execute queries originating from itself 
(WL#794). This can be of interest in some recovery-from-backup scenarios, and also when you have
two databases in one mysqld, having a certain similarity and you want one db to be updated when the other is
(some sort of trigger).
Plus small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT"
 2004-04-28 18:24:46 +02:00
monty@mysql.com
f61b08a24b Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-04-28 18:38:30 +03:00
antony@ltantony.dsl-verizon.net
9bd11ea8f6 Merge ltantony.dsl-verizon.net:/usr/home/antony/work/mysql-4.0 
into ltantony.dsl-verizon.net:/usr/home/antony/work/bug3481
 2004-04-28 16:38:29 +01:00
antony@ltantony.dsl-verizon.net
28870228d4 Fix for Bug 3481 
CREATE statement allowed extra unnecessary commas
 2004-04-28 16:14:53 +01:00
monty@mysql.com
f10d098f7d Fixed http address in some scripts (Bug #3460) 
Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) (portability fix)
Fixed that INTERVAL can handle big integers. (Bug #3498)
Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473)
 2004-04-28 17:45:08 +03:00
serg@serg.mylan
2bcfab10ea bug#3556 - soundex 2004-04-28 14:19:02 +02:00
monty@mysql.com
edc584acce Fixed stack overrun with some INSERT ... SELECT ... GROUP BY queries (Bug #3265) 
Ensure that raid_chunks is not set to higher than 255 as this could cause problems with DROP DATABASE. (Bug #3182)
 2004-04-28 03:37:45 +03:00
serg@serg.mylan
3a7b6d68e7 after-merge fix: make concurrent-insert-skip code ft2-aware 2004-04-27 21:17:10 +02:00
monty@mishka.local
4999203fbd Fixed results for previous patch 
Ensure that mysqldump doesn't give an error about missing Index.xml when it's not needed
 2004-04-27 17:32:40 +03:00
monty@mishka.local
ef18b13738 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mishka.local:/home/my/mysql-4.1
 2004-04-27 15:48:48 +03:00
monty@mishka.local
e9cfe01db0 After merge fixes 
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
 2004-04-27 15:33:40 +03:00
monty@mishka.local
21fd1d270e Merge with 4.0 2004-04-26 15:53:31 +03:00
marko@hundin.mysql.fi
4e65909621 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-04-23 11:03:52 +03:00
serg@sergbook.mylan
606073084e symlink, not hardlink 
mkdir in Makefile, not in configure
chmod a-x
 2004-04-21 14:55:39 -05:00
marko@hundin.mysql.fi
df5336a3cc Introduce keys in child tables corresponding to FOREIGN KEYs 
Remove redundant keys in CREATE TABLE and ALTER TABLE
 2004-04-21 13:15:43 +03:00
tomas@mc05.(none)
78b242c946 install_ndbcluster: 
cosmetic
 2004-04-18 22:02:12 +02:00
bell@sanja.is.com.ua
918183a667 fixed option name 2004-04-16 08:49:50 +03:00
bell@sanja.is.com.ua
c8d836aa66 merge 2004-04-16 08:39:03 +03:00
bell@sanja.is.com.ua
df5df8a1d1 allow --skip-ndbcluster if server is not compiled 
fixed syntax errro
 2004-04-16 08:32:10 +03:00
magnus@neptunus.(none)
af263160f2 Fix mysql-test-run to work better with NDB 
Fix broken string constant in mysqld.cc
 2004-04-15 17:30:50 +02:00
magnus@neptunus.(none)
855fcf1411 Updated mysql-test-run to work with the started NDB Cluster 
Added one test case for ndb to mysql-test-run, ndb_basic. It will show that
NDB Cluster is supported.
 2004-04-15 12:03:13 +02:00
tomas@mc05.(none)
d48ebf3e58 mysql-test-run.sh: 
added options for ndbcluster
 2004-04-14 17:16:31 +02:00
tomas@mc05.(none)
40de5714b0 logging_ok: 
Logging to logging@openlogging.org accepted
stop_ndbcluster, ndb_config_2_node.ini, install_ndbcluster:
  new file
 2004-04-14 15:46:39 +02:00
guilhem@mysql.com
5c7d736443 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-04-13 22:41:00 +02:00
guilhem@mysql.com
066382e6e7 Fix for BUG#3461 "multi-table DELETE replicated despite replicate-wild-ignore-table": 
In tables_ok(), when there is no table having "updating==TRUE" in the list,
    return that we don't replicate this statement (the slave is supposed to
    replicate *changes* only).
    In practice, the case can only happen for this statement:
    DELETE t FROM t,u WHERE ... ;
    tables_ok(t,u) will now return 0, which (check all_tables_not_ok())
    will give a chance to tables_ok(t) to run.
 2004-04-13 22:40:16 +02:00
ram@gw.mysql.r18.ru
c8937dbcb7 A fix. (Bug #3376: AVG(constant) returns constant if no rows in result set) 2004-04-09 19:07:39 +05:00
bell@sanja.is.com.ua
e8137a13e0 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
 2004-04-09 11:31:06 +03:00
monty@mysql.com
f96c4941d8 Fixed problems noticed with last build 2004-04-09 07:12:41 +03:00
bell@sanja.is.com.ua
555eb86616 merge 2004-04-08 23:50:10 +03:00
monty@mysql.com
00738a2be0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-08 15:02:25 +03:00
monty@mysql.com
43546e7a82 Moved reading of ranges from opt_range.cc to handler.cc 
This gives the handler more optimization possiblities and is needed for NDB cluster
Fixed not-initialized memory error detected by valgrind
 2004-04-08 13:58:06 +03:00
bell@sanja.is.com.ua
56be6f3f93 merge 2004-04-08 00:19:43 +03:00
bell@sanja.is.com.ua
5e37c41fae new error for unsupported command in PS 
fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
 2004-04-08 00:16:17 +03:00
serg@serg.mylan
6ebf869b40 merged 2004-04-07 16:20:46 +02:00
serg@serg.mylan
6fc74e13e7 post-review fixes 
HA_EXTRA_WRITE_CACHE now part of start_bulk_insert()
test cleanups
 2004-04-07 16:04:28 +02:00
bell@sanja.is.com.ua
61fd95d168 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
 2004-04-07 15:23:05 +03:00
vva@eagle.mysql.r18.ru
5fa9953ce3 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_3342/mysql-4.1
 2004-04-07 17:23:04 +05:00
monty@mysql.com
70c4eb5838 Portability fixes 
Fixed problems with group_concat() and HAVING
Updated crash-me values
 2004-04-07 04:33:58 +03:00
serg@serg.mylan
e8eda8129f ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert() 
Field::val_str simplification, comment
 2004-04-06 21:35:26 +02:00
monty@mysql.com
472e87a40c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-06 18:30:34 +03:00
vva@eagle.mysql.r18.ru
aeff7ce714 fixed 
bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"
(now it require only SELECT privilege on database)
 2004-04-06 20:26:35 +05:00
bar@bar.intranet.mysql.r18.ru
950a2ebab1 Fixed charsetnr sent to the client 2004-04-06 19:57:33 +05:00
monty@mysql.com
7ca9a70583 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-06 17:17:15 +03:00
vva@eagle.mysql.r18.ru
0cc998a466 fixed the tests mysql-test/t/synchronization.test 
for Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
 2004-04-06 19:17:13 +05:00
monty@mysql.com
49330f61da Fixed warnings from valgrind (not a bug) 
Don't add -debug to server version if MYSQL_SERVER_PREFIX is used
Indentation cleanups
 2004-04-06 12:13:43 +03:00
vva@eagle.mysql.r18.ru
7b68b26623 fixed Bug #3361 "mysqldump quotes DECIMAL values" 2004-04-05 23:18:16 +05:00
gluh@gluh.mysql.r18.ru
03caa47acb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.curr
 2004-04-05 19:14:31 +05:00
monty@mysql.com
0013516951 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-05 16:28:16 +03:00
vva@eagle.mysql.r18.ru
611409490a corrected wrong checking of DBUG_OFF in mysql-test/t/synchronization.test 2004-04-05 18:27:19 +05:00
gluh@gluh.mysql.r18.ru
8a4e6c6482 WL1368: SHOW GRANTS FOR CURRENT USER 
'SHOW GRANTS' syntax is added 
  'SHOW GRANTS FOR CURRENT_USER' syntax is added
  'SHOW GRANTS FOR CURRENT_USER()' syntax is added
 CURRENT_USER without parens in expressions(SELECT CURRENT_USER;)
 2004-04-05 17:55:26 +05:00
monty@mysql.com
42cf92ce37 Fixed many compiler warnings 
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695, #3381 and #3319)
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly
 2004-04-05 13:56:05 +03:00
bell@sanja.is.com.ua
1e4af935c1 removed old way to prevent using stack tables for caching Items in PS 
fixed error code in union test
 2004-04-04 03:05:44 +03:00
bell@sanja.is.com.ua
c31f3cf1d2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-on-4.1
 2004-04-03 11:28:20 +03:00
bell@sanja.is.com.ua
2f4d2a0e38 fixed brocken of client_test 
fixed aggregate functions in PS (BUG#3360)
 2004-04-03 11:13:51 +03:00
vva@eagle.mysql.r18.ru
18b4e9c970 added skipped ``mysql-test/r/synchronization.result'' 2004-04-03 02:50:40 +05:00
vva@eagle.mysql.r18.ru
00d429ac51 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
 2004-04-03 02:47:02 +05:00
vva@eagle.mysql.r18.ru
5f2d73ed96 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
 2004-04-03 02:46:12 +05:00
vva@eagle.mysql.r18.ru
8cc3b3cfdc made some optimization of last patch for 
Bug #2385 "CREATE TABLE LIKE lacks locking on source and destination table" 
(in sql_table.cc and mysql-test/t/synchronization.test)
 2004-04-03 02:44:38 +05:00
vva@eagle.mysql.r18.ru
1198b23a73 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2397/mysql-4.1
 2004-04-03 01:39:45 +05:00
vva@eagle.mysql.r18.ru
64e9d61fd2 added newline to the end of mysql-test/t/system_mysql_db_fix-master.opt 
for working on aix and so on..
 2004-04-02 21:58:34 +05:00
dlenev@jabberwock.localdomain
f6bff2e6c6 WL#1266 "Separate auto-set logic from TIMESTAMP type." 
Final version of patch.

Adds support for specifying of DEFAULT NOW() and/or ON UPDATE NOW()
clauses for TIMESTAMP field definition.
Current implementation allows only one such field per table and
uses several unireg types for storing info about this properties of
field. It should be replaced with better implementation when new
.frm format is introduced.
 2004-04-02 10:12:53 +04:00
dlenev@jabberwock.localdomain
a80f46bfdf WL#775 "Add status variable identifying binlog_cache_size shortage" 
Added two status variables: 
  binlog_cache_use - counts number of transactions that used somehow
    transaction temporary binary log.
  binlog_cache_disk_use - counts number of transactions that required
    disk I/O for storing info in this this binary log.
 2004-04-02 00:47:20 +04:00
vva@eagle.mysql.r18.ru
15cd52c6cb added synchronization in mysql_create_like_table 
(
fixed BUG #2385 CREATE TABLE LIKE lacks locking on source and destination table
and added tests for it
)
 2004-04-01 23:13:25 +05:00
vva@eagle.mysql.r18.ru
7a580ce991 fixed 
BUG #2397 "RENAME TABLES is not blocked by FLUSH TABLES WITH READ LOCK"
(added waiting for global_read_lock in mysql_rename_tables)
 2004-04-01 22:47:09 +05:00
gluh@gluh.mysql.r18.ru
da3308ef57 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.1
 2004-03-31 14:30:53 +05:00
gluh@gluh.mysql.r18.ru
daba6b63b8 Fix for bug #2160: Extra error message for CREATE TABLE LIKE with InnoDB 2004-03-31 14:29:01 +05:00
bell@sanja.is.com.ua
99f712a30b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
 2004-03-31 08:24:12 +03:00
monty@mysql.com
ddafa2cc16 simple optimzation 
Portability fixes
 2004-03-31 03:32:38 +03:00
bell@sanja.is.com.ua
e3a619f005 null processing for character_set_results (BUG#3296) 2004-03-30 23:38:56 +03:00
monty@mysql.com
fede76ddf2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-03-30 22:20:40 +03:00
bar@bar.intranet.mysql.r18.ru
eedb8ce92e http://bugs.mysql.com/bug.php?id=3255 
Collation gets lost in CREATE TABLE (...) DEFAULT CHARACTER SET xxx COLLATE yyy

This is fixed now.
Test is added into the test suite.
 2004-03-30 22:38:52 +05:00
bar@bar.intranet.mysql.r18.ru
b92dd45da4 ALTER TABLE t1 CONVERT TO should also change the default character set. 
Forgot to do it in the previous commit.
 2004-03-30 22:18:49 +05:00
bar@bar.intranet.mysql.r18.ru
dba73e1c86 More different syntaxes for (1) modifying the default charaset/collation 
and for (2) converting the columns:

1.  ALTER TABLE t1 [DEFAULT] CHARACTER SET xxx [COLLATE yyy]
2.  ALTER TABLE t1 CONVERT TO CHARACTER SET xxx [COLLATE yyy]
 2004-03-30 21:33:45 +05:00
monty@mysql.com
f602829c75 Fix to get correct metadata when using temporary tables to create result. (Bug #2654) 2004-03-30 19:24:28 +03:00
ram@gw.mysql.r18.ru
3bfbe6e0dd resolving conflicts 2004-03-30 16:04:08 +05:00
monty@mysql.com
4bc6b551f8 false/true -> FALSE/TRUE 
Fixes after last merge
 2004-03-30 02:32:41 +03:00
monty@mysql.com
38ab8ddb22 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-03-30 01:02:21 +03:00
monty@mysql.com
8ab16104e8 Fix test results when you are in daylight saving time 2004-03-30 01:01:31 +03:00
monty@mysql.com
dc2f606fb8 Merge with 4.0 to get lastest bug fixes 2004-03-29 19:21:53 +03:00
monty@mysql.com
7e161ae070 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-03-29 17:27:25 +03:00
bar@bar.intranet.mysql.r18.ru
928e796e67 Better error messages for not nullable 
SET character_set_xxx=NULL
and
SET collation_xxx=NULL
 2004-03-29 18:33:24 +05:00
bar@bar.intranet.mysql.r18.ru
11f14e0050 Better tests for BINARY 2004-03-29 17:27:30 +05:00
bar@bar.intranet.mysql.r18.ru
f84f6d5cdb Checking Thai sort order and trailing spaces handling 2004-03-29 16:38:38 +05:00
guilhem@mysql.com
19f0843f3f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2004-03-27 01:08:29 +01:00
guilhem@mysql.com
3826a01ee4 A previous changeset by me today about SQL_LOG_BIN had the problem 
that it tested the privilege in ::update() whereas it should be
in ::check() (see email from Serg, subject
"Re: bk commit - 4.1 tree (guilhem:1.1706)").
So I add instead a check_func function to sys_var_thd_bit.
I do the same addition to sys_var_thd_ulong, to unify handling
of PSEUDO_THREAD_ID with the one of SQL_LOG_BIN. So class
sys_var_pseudo_thread_id is not needed anymore, removing it.
 2004-03-27 01:07:09 +01:00
vva@eagle.mysql.r18.ru
c81bf339c2 some cleanup of last patch for BUG #2342 2004-03-27 02:37:05 +04:00
vva@eagle.mysql.r18.ru
8a66c13b34 fixed bug #2342 
"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"
 2004-03-27 02:29:31 +04:00
vva@eagle.mysql.r18.ru
1eff4744f1 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2342/mysql-4.0
 2004-03-27 00:41:48 +04:00
vva@eagle.mysql.r18.ru
23d30c397d fixed bug #2342 
"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"

1. added new status HA_ADMIN_REJECT and processing of it in mysql_admin_table
2. got ha_berkley::analyze to return HA_ADMIN_REJECT if there are any 
 transactions with the table..
 2004-03-27 00:35:45 +04:00
guilhem@mysql.com
380134891d Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2004-03-26 19:29:10 +01:00
guilhem@mysql.com
8066c2ce75 Changing SET SQL_LOG_BIN so that it explicitely throws an error if 
user is not SUPER, instead of setting the value but ignoring it
silently internally.
 2004-03-26 19:25:22 +01:00
Sinisa@sinisa.nasamreza.org
e2b48a2232 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2004-03-26 17:01:55 +02:00
Sinisa@sinisa.nasamreza.org
09d26f0ff6 order_by.result: 
result of the test case for FORCE INDEX on ORDER BY
order_by.test:
  test case for FORCE INDEX on ORDER BY
sql_select.cc:
  Changing behaviour that MySQL server takes FORCE INDEX clause into account when optimising ORDER BY clause
 2004-03-26 17:01:13 +02:00