guilhem@mysql.com
e38dae0bc1
Merge
2004-11-16 00:04:12 +01:00
serg@serg.mylan
1625878788
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-15 22:45:53 +01:00
serg@serg.mylan
8edd5d99e2
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-15 22:29:50 +01:00
Sinisa@sinisa.nasamreza.org
07a879940d
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sinisa.nasamreza.org:/mnt/work/petica
2004-11-15 23:29:50 +02:00
gluh@gluh.mysql.r18.ru
cfc6e6dc4b
valgrind error fix
2004-11-16 00:29:49 +03:00
Sinisa@sinisa.nasamreza.org
775c808cc9
fixing a small typo
2004-11-15 23:25:24 +02:00
serg@serg.mylan
e9b140bc5f
fixed "condition is always false" warnings
2004-11-15 22:12:19 +01:00
serg@serg.mylan
87840e841c
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-15 19:27:06 +01:00
gluh@gluh.mysql.r18.ru
c67d479918
Fixes for information_schema
2004-11-15 19:20:45 +03:00
lars@mysql.com
b7cfe5ecad
BUG#6353 V2:
...
Replication using replicate-rewrite-db did not work for LOAD DATA INFILE.
Now is does. There was one place in the code that used current database
instead of the rewrite database.
2004-11-15 17:03:54 +01:00
bell@sanja.is.com.ua
9950ccd278
fixed incorrect using of THD::is_fatal_error
2004-11-14 10:25:38 +02:00
bell@sanja.is.com.ua
bb52950625
make information schema libmysqld compatible
...
fixed typo
2004-11-14 00:28:44 +02:00
bell@sanja.is.com.ua
25d0f827ce
posmerge fixes
2004-11-13 23:26:15 +02:00
bell@sanja.is.com.ua
d76db8b999
marge
2004-11-13 19:45:36 +02:00
bell@sanja.is.com.ua
7210195f1e
now my_printf_error is not better then my_error, but my_error call is shorter
...
used only one implementation of format parser of (printf)
fixed multistatement
2004-11-13 19:35:51 +02: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
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
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
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
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
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
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
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
konstantin@mysql.com
dad42cb4ee
Rename: send_prepare_results -> check_prepared_statement (sql_prepare.cc)
2004-11-11 23:30:39 +03: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
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
