mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12421 commits 2781 branches 343 tags 1.6 GiB
Commit graph

2706 commits

Author SHA1 Message Date
pem@mysql.com
a528b157c0 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2004-05-17 10:15:23 +02:00
guilhem@mysql.com
9620715679 a code fix (don't specify default value of argument twice), updating a line of SHOW SLAVE STATUS 
in tests after the last 4.1->5.0 merge, and:
*** The same as ChangeSet@1.1822.1.1, 2004-05-14 23:08:03+02:00, guilhem@mysql.com of MySQL 4.0 ***
  Replication testsuite: making the master-slave synchronization less likely to fail,
  by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
  in sync_with_master and sync_slave_with_master.
  The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
  but may affect 4.x as well, so I fixed 4.x too. Note that I am also fixing
  5.0, with the same exact patch, because I don't want to leave 5.0 broken
  until the next 4.0->4.1->5.0 merge.
 2004-05-14 23:19:42 +02:00
pem@mysql.comhem.se
9ec93a8948 Post-merge post-merge post fix. ;-) 2004-05-14 17:47:11 +02:00
pem@mysql.com
df69f93ae9 Post-merge post-merge fix (new error codes for fparser). 2004-05-14 16:10:31 +02:00
pem@mysql.comhem.se
ec92106535 Post-merge fixes. 
Note: One sp.test still fails (prime), and rpl_server_id2.test fails (will be fixed by guilhem ASAP).
 2004-05-14 16:00:57 +02:00
pem@mysql.comhem.se
017ffcdeaf Fixed comment for prime test. 
(Again, mostly to test sendmail replacement for tunneling.)
 2004-05-13 13:29:18 +02:00
pem@mysql.comhem.se
e27e208f67 Added comment about expected result for prime test. 
(This is mostly to test sendmail tunneling of commit email...
 might not actually get pushed)
 2004-05-13 13:08:16 +02:00
timour@mysql.com
eadcae3dc1 Merge of WL#1469 with latest bk version. 2004-05-11 12:12:32 +03:00
timour@mysql.com
a840d8daad Complete implementation of WL#1469 "Greedy algorithm to search for an optimal execution plan", 
consisting of pos-review fixes and improvements.
 2004-05-10 15:48:50 +03:00
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02: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
monty@mysql.com
28673669a4 Merge with 4.0 to get security patch for check_grant_colum 2004-05-06 13:42:26 +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
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
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
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
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
pem@mysql.comhem.se
e1182c5226 Correction of WL#1567: row_count() is -1 following non-insert/update/delete 
statements.
 2004-05-04 17:18:47 +02: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
pem@mysql.comhem.se
296ba0ea57 WL#1567: Add ROW_COUNT() Function to retrieve count of rows updated/inserted/deleted 2004-05-04 13:45:20 +02: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
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
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
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
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
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
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
pem@mysql.comhem.se
d42b145817 Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc 
merged manually by guilhem.
 2004-04-28 12:08:54 +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