Commit graph

16824 commits

Author SHA1 Message Date
monty@mysql.com
e9c3887b58 After merge fixes 2004-11-12 17:44:17 +02:00
serg@serg.mylan
e20732b073 typos in error messages fixed 2004-11-12 16:41:53 +01:00
paul@ice.snake.net
1288f453cc fill_help_tables.sh:
Recognize another Texinfo tag.
2004-11-12 08:45:58 -06:00
dlenev@mysql.com
18f033b771 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg5890
2004-11-12 17:21:24 +03:00
dlenev@brandersnatch.localdomain
e7a2466024 Fix for bug #5890 "Triggers fail for DELETE without WHERE".
If we have DELETE with always true WHERE clause we should not use 
optimized delete_all_rows() method for tables with DELETE triggers,
because in this case we will lose side-effect of deletion.
2004-11-12 17:04:07 +03:00
bell@sanja.is.com.ua
1555469b64 merge 2004-11-12 15:36:31 +02:00
paul@ice.snake.net
d927503a96 mysqldump.c:
Add missing sentinel.
2004-11-12 07:13:46 -06:00
monty@mysql.com
114cc9f463 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-11-12 14:39:26 +02:00
monty@mysql.com
a2cca07617 Ensure that new connections are in state SLEEP (for nicer show processlist) 2004-11-12 14:38:01 +02:00
bell@sanja.is.com.ua
31f7811183 post-review fixes 2004-11-12 14:34:00 +02:00
pem@mysql.comhem.se
232abd5f6e Fixed merge bug(?) in mysqldump.c. 2004-11-12 13:02:17 +01:00
pem@mysql.comhem.se
a7ee4f336f Various build fixes. 2004-11-12 12:28:34 +01:00
pem@mysql.comhem.se
b95560a8fc Build fixes to make it compile. 2004-11-12 11:37:59 +01:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
ram@gw.mysql.r18.ru
77fe1baf1d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6564
2004-11-12 12:38:07 +04:00
ram@gw.mysql.r18.ru
ec025721bd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6551
2004-11-12 12:36:42 +04:00
monty@mysql.com
bfe2917f89 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-11-12 10:22:15 +02:00
brian@avenger.(none)
1d8a6a06a5 Merge avenger.(none):/export/brian/mysql/test/4.1
into avenger.(none):/export/brian/mysql/test/5.0
2004-11-11 22:12:01 -08:00
brian@avenger.(none)
b5e02d3276 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into avenger.(none):/export/brian/mysql/test/5.0
2004-11-11 19:15:41 -08:00
brian@avenger.(none)
3e4ca194f8 Mainly resolving Guilhem's 4.1 patch to 5.0 2004-11-11 19:01:46 -08:00
brian@avenger.(none)
f05daf02ba Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
2ad7d5c662 Bug#6123 - GRANT USAGE creates useless mysql.db row
Prevent creation of a row which grants no rights
  Test included
2004-11-11 20:59:03 +00:00
paul@kite-hub.kitebird.com
8c2f17d1d8 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-11-11 14:56:44 -06:00
paul@kite-hub.kitebird.com
af8d361217 mysqldump.c:
Reorder options, revise --hex-blob help string.
2004-11-11 14:55:55 -06:00
konstantin@mysql.com
dad42cb4ee Rename: send_prepare_results -> check_prepared_statement (sql_prepare.cc) 2004-11-11 23:30:39 +03:00
serg@serg.mylan
0be3c55594 mi_write: fix for ft2 when found word (in the tree) has different length as the word to insert 2004-11-11 21:26:24 +01:00
konstantin@mysql.com
1d32e06be9 Few more places with thd->lex replaced with lex (mysql_update,
check_simple_select). This change was inspired by Monty in December 2003
when thd->lex became a pointer in 4.1.
2004-11-11 22:37:48 +03:00
heikki@hundin.mysql.fi
38cae36c87 trx0purge.c:
Remove duplicated innodb max purge lag code
2004-11-11 21:17:44 +02:00
konstantin@mysql.com
6ccdd6c454 Cleanup: thd->lex->select_lex -> select_lex (sql_delete.cc) 2004-11-11 22:16:46 +03:00
konstantin@mysql.com
baf9771474 Cleanup in sql_acl.cc: thd->lex ->lex 2004-11-11 21:57:55 +03:00
konstantin@mysql.com
e5f4c7a0bd Rename: Item::val -> Item::val_real(). 2004-11-11 21:39:35 +03:00
timour@mysql.com
ea97ce50b9 post-merge fixes for WL#1972 2004-11-11 20:16:38 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
6f39bf2b9c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469
2004-11-11 17:12:25 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
e0527b1750 Merge pcgem.rdg.cyberkinetica.com:/mnt/staff/repositories/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469
2004-11-11 17:07:57 +00:00
tomas@poseidon.ndb.mysql.com
09ee973411 ndb_test_platform.cpp:
better printouts in ndb_test_platform
2004-11-11 16:51:38 +00:00
tomas@poseidon.ndb.mysql.com
37d1b4ecd5 waiter.cpp:
fixed so that connectring option works
2004-11-11 16:38:15 +00:00
timour@mysql.com
7073829fbb Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-1972
2004-11-11 18:23:14 +02:00
tomas@poseidon.ndb.mysql.com
33bb73da67 mysql-test-run.sh:
made sleep time for second master larger so that it has time to start
2004-11-11 16:06:47 +00:00
tomas@poseidon.ndb.mysql.com
399ad08e4f basestring_vsnprintf fix for size==0 2004-11-11 15:53:33 +00:00
pem@mysql.comhem.se
aa6d99dd0a Fixing filename case problems in sql_base.cc for views on MacOS X. (With help from sanja :) 2004-11-11 16:00:50 +01:00
jani@a80-186-24-72.elisa-laajakaista.fi
54dac2cfac Some code clean-up and optimization. 2004-11-11 16:59:36 +02:00
pem@mysql.com
9c115a21b5 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2004-11-11 15:25:40 +01:00
ram@gw.mysql.r18.ru
98df9313c0 A fix (bug #6564: QUOTE(NULL) returns NULL, not the string 'NULL') 2004-11-11 18:20:40 +04:00
jani@a80-186-24-72.elisa-laajakaista.fi
4f04217879 Removed check for .ini file elsewhere, except on Windows. 2004-11-11 16:20:39 +02:00
serg@serg.mylan
2f7c13f884 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-11 15:02:16 +01:00
joerg@mysql.com
8f010dd9f9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2004-11-11 14:59:08 +01:00
serg@serg.mylan
c77f478e1b document DBUG_OUTPUT()
misc cleanup
2004-11-11 14:42:35 +01:00
monty@mysql.com
7c9b83fc92 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-11-11 15:22:34 +02:00
tomas@poseidon.ndb.mysql.com
e0a3e48f7e forgot a return 0
removed some errorcodes not used
2004-11-11 13:22:33 +00:00
joerg@mysql.com
437a80ed66 Corrected a syntax error detected in test build. 2004-11-11 14:12:45 +01:00