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 |
|
bell@sanja.is.com.ua
|
1555469b64
|
merge
|
2004-11-12 15:36:31 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
pem@mysql.com
|
b02c16415b
|
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
|
2004-11-11 13:36:05 +01:00 |
|
pem@mysql.comhem.se
|
b697626721
|
Updated lowercase_table2.results. (show tables output has changed)
|
2004-11-11 13:35:04 +01:00 |
|
serg@serg.mylan
|
d74b5499d2
|
'5.4', -1, HALF_UP
fixed
|
2004-11-11 12:43:08 +01:00 |
|
tomas@poseidon.ndb.mysql.com
|
fd39778fcf
|
ndbcluster.sh:
fixed typo
|
2004-11-11 11:08:37 +00:00 |
|
tomas@poseidon.ndb.mysql.com
|
8b0101a0d7
|
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
|
2004-11-11 10:31:34 +00:00 |
|
tomas@poseidon.ndb.mysql.com
|
6a9cbe487e
|
added ndb error codes and better explanations
|
2004-11-11 10:05:28 +00:00 |
|
timour@mysql.com
|
e61b4454da
|
Merge of WL#1972 "Evaluate HAVING before SELECT select-list"
|
2004-11-11 11:31:58 +02:00 |
|
guilhem@mysql.com
|
5d35cc0d8e
|
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
|
2004-11-11 10:25:28 +01:00 |
|
guilhem@mysql.com
|
91a40d4220
|
Fix for autobuild failure: forgotten ';' (bison 1.875 accepts if it's not there, but 1.75 does not)
|
2004-11-11 10:24:16 +01:00 |
|
timour@mysql.com
|
9a4ffb5ad9
|
WL#1972 - manual merge with latest bk source tree
|
2004-11-11 11:16:51 +02:00 |
|
timour@mysql.com
|
71c4cc4ae6
|
WL#1972 - manual merge with latest bk source
|
2004-11-11 10:09:50 +02:00 |
|
ram@gw.mysql.r18.ru
|
582f9a8900
|
Added ending ';' for the start_transaction_opts:
|
2004-11-11 10:50:46 +04:00 |
|
paul@ice.snake.net
|
9ee3bf9efa
|
fill_help_tables.sh:
Handle some additional Texinfo tags that were being missed.
|
2004-11-10 22:43:09 -06:00 |
|
guilhem@mysql.com
|
f9a51b66ae
|
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
|
2004-11-11 00:27:34 +01:00 |
|
guilhem@mysql.com
|
09da85338c
|
no new message in 4.1 (causes merge issues with 5.0). Using ER_UNKNOW_ERROR and hardcoded message string instead.
|
2004-11-11 00:00:17 +01:00 |
|
monty@mysql.com
|
7d78fd077a
|
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
|
2004-11-11 00:36:56 +02:00 |
|
monty@mysql.com
|
68130e428a
|
Added possibility to detect if libmysqld is restarted
(Needed to check if memory allocated with mysql_once_init() has been freed)
|
2004-11-11 00:36:18 +02:00 |
|
igor@rurik.mysql.com
|
f65e054788
|
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
|
2004-11-10 11:24:03 -08:00 |
|