Commit graph

16899 commits

Author SHA1 Message Date
pekka@mysql.com
52e05dadac ndb: fix bug-4644 Err Out of fragment operations 2004-11-13 17:34:34 +01:00
gluh@gluh.mysql.r18.ru
321f803784 WL#1629: SHOW with WHERE(partially) &
WL#173:  Create Data Dictionary Tables for SHOW Commands
2004-11-13 13:56:39 +03:00
patg@patrick-galbraiths-computer.local
7df412160a Needed for WL# 2094, MySQL Federated Storage Handler
sql_string.h:
  simple string method to drop last character of a string (also decrements str_length)
2004-11-12 15:56:25 -08:00
serg@serg.mylan
3d67df4cff wrong constant fixed - boolean fulltext searches like "+something +smth*"
were stopping at docid 0xffffffff
2004-11-12 22:55:00 +01:00
paul@kite-hub.kitebird.com
31493800d5 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2004-11-12 14:44:14 -06:00
paul@kite-hub.kitebird.com
a6b6352d95 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-4.1
2004-11-12 14:15:51 -06:00
paul@kite-hub.kitebird.com
79d8bde11e Makefile.am:
Add -acc flag for texi2html to handle accented characters.
2004-11-12 14:15:06 -06:00
monty@mysql.com
6cf9ea2c9a Add back data that bk loosed during automatic merge 2004-11-12 21:42:44 +02:00
monty@mysql.com
63da075081 Merge with 4.1 to get latest fix to client_test.c 2004-11-12 21:27:52 +02:00
monty@mysql.com
e0f1e6af36 Portability fix for gcc 2.95.3
After merge fixes
2004-11-12 21:24:16 +02:00
monty@mysql.com
d164fc430d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-11-12 21:17:50 +02:00
jani@ua141d10.elisa.omakaista.fi
dc66722350 Fixed a function call. 2004-11-12 20:47:41 +02:00
jani@ua141d10.elisa.omakaista.fi
fe0b00985f Merge with 4.0 2004-11-12 20:38:58 +02:00
monty@mysql.com
addd1a0da8 Merge with 4.1 2004-11-12 19:58:24 +02:00
jani@ua141d10.elisa.omakaista.fi
4ffbe56644 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2004-11-12 19:54:49 +02:00
jani@ua141d10.elisa.omakaista.fi
dc6452a4d4 Code cleanup and some optimizations. 2004-11-12 19:54:25 +02:00
jani@ua141d10.elisa.omakaista.fi
76b8c8747d Removed an unneccessary for() and variable. 2004-11-12 19:22:58 +02:00
monty@mysql.com
16c1b9f44e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-11-12 19:12:18 +02:00
monty@mysql.com
08c5b245b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-11-12 19:08:33 +02:00
jani@ua141d10.elisa.omakaista.fi
81d7fc68ff Changed some unneccessary calls to current_thd() into table->in_use 2004-11-12 19:04:35 +02:00
monty@mysql.com
c724163e14 Fix to allow usage of 4.0 tables with 4.1 2004-11-12 19:01:49 +02:00
jani@ua141d10.elisa.omakaista.fi
340ba1cf56 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2004-11-12 18:31:11 +02:00
jani@ua141d10.elisa.omakaista.fi
379b46128f Added possibility to run only certain tests by giving the test name(s)
as argument(s) after options.

Added option -T to display all current test names.
2004-11-12 18:30:30 +02:00
serg@serg.mylan
eab281e25a Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-12 16:48:02 +01:00
monty@mysql.com
b56851fd7a Merge on pull 2004-11-12 17:48:01 +02:00
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