Commit graph

11630 commits

Author SHA1 Message Date
serg@serg.mylan
13946359c6 DROP DATABASE now returns (affected_rows) number of tables dropped 2004-03-19 16:43:03 +01:00
ingo@mysql.com
6a636a4d07 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1648
2004-03-19 15:02:26 +01:00
monty@mysql.com
933278a52b merge with 4.0 (to get compiler error fixes for innodb) 2004-03-19 15:17:56 +02:00
monty@mysql.com
f375eb50f8 Removed \r 2004-03-19 15:03:12 +02:00
monty@mysql.com
b7fc7188d0 Portability fixes
Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work
2004-03-19 14:52:48 +02:00
bar@bar.intranet.mysql.r18.ru
f3c4bda023 uca-dump.c:
new file
2004-03-19 16:29:37 +04:00
monty@mysql.com
b4364ca7a6 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-03-19 13:04:46 +02:00
gluh@gluh.mysql.r18.ru
00630a2640 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
2004-03-19 14:36:12 +04:00
gluh@gluh.mysql.r18.ru
e9341da7e7 Fix for bug#1439 UDF Corruption 2004-03-19 14:35:00 +04:00
bar@bar.intranet.mysql.r18.ru
66631a3c1e Bug #3087 CONCAT_WS makes the server die in case of illegal mix of collations 2004-03-19 12:09:14 +04:00
bar@bar.intranet.mysql.r18.ru
f897144c4e Bug #2821 Table default character set affects LONGBLOB fields 2004-03-19 11:37:49 +04:00
bar@bar.intranet.mysql.r18.ru
fc17aad767 min_sort_char was added, for the future UCA implementation.
UCS2 now has its own my_like_range function.
2004-03-19 10:00:46 +04:00
lenz@mysql.com
698217c8d5 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-03-18 22:48:37 +01:00
lenz@kallisto.local
9ab6567bcd - reverted use of AC_CONFIG_SUBDIRS for BDB for now (it somehow did
not work as expected) - need to investigate (after 4.1.2 is released)
2004-03-18 22:46:41 +01:00
guilhem@mysql.com
34aefdf31e Fix for BUG#3214 "mysqlbinlog --read-from-remote-server --position prints wrong positions"
I am fixing it here in 4.1, not in 4.0, as it goes with another change
which I did in 4.1 (fix for BUG#3204
""mysqlbinlog --read-from-remote-server this_binlog.001" prints all binlogs").
2004-03-18 20:53:33 +02:00
guilhem@mysql.com
32feac3093 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2004-03-18 19:31:06 +02:00
guilhem@mysql.com
244304fdbb Fix for BUG#3204 ""mysqlbinlog --read-from-remote-server this_binlog.001" prints all binlogs":
we now detect that the server is sending us a log which we did not request
by testing the info in the fake Rotate event.
I also changed code to not print the fake Rotate which describes the
log we asked for (it's always the first received event but old masters
may not send it).
2004-03-18 19:29:07 +02:00
bell@sanja.is.com.ua
ede07fcdcf fixed signed numeric literal parsing 2004-03-18 18:27:03 +02:00
ingo@mysql.com
7216c3b272 WL#1648 - Start/Stop Inserting Duplicates Into a Table 2004-03-18 16:47:16 +01:00
bell@sanja.is.com.ua
613104ad25 merge 2004-03-18 15:21:06 +02:00
bell@sanja.is.com.ua
2b45b53066 DBUG_ASSERT(fixed == 1); added to val*
small optimisation in signed_literal
2004-03-18 15:14:36 +02:00
monty@mysql.com
1e0ccbd9b0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-18 14:57:23 +02:00
heikki@hundin.mysql.fi
fd15536808 trx0undo.h, trx0undo.c, trx0trx.c:
Update an obsolete comment about trx commit: we can no longer call trx_undo_update_cleanup_by_discard(), and actually, the idea to call it was erroneous, it cannot work
2004-03-18 14:57:22 +02:00
monty@mysql.com
53196273c9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-18 14:54:12 +02:00
monty@mysql.com
75dda82526 Removed compiler warning
Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
2004-03-18 14:53:38 +02:00
hf@deer.(none)
e93b933ade Fix for #3188 2004-03-18 16:49:48 +04:00
lenz@mysql.com
2de6b52000 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-03-18 13:17:44 +01:00
lenz@kallisto.local
4493a24dc7 - Use AC_CONFIG_SUBDIRS to invoke the InnoDB and BDB configure scripts
instead of calling them directly (WL#1521) - this also fixed a compile
   error with libtool-1.5.2 on FreeBSD (error: tag name "CXX" already 
   exists)
2004-03-18 13:15:05 +01:00
gluh@gluh.mysql.r18.ru
7aee76256b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
2004-03-18 15:54:04 +04:00
gluh@gluh.mysql.r18.ru
1dfe9a0330 Fix for valgrind errors in str_to_TIME(using of uninitialize variable). 2004-03-18 15:51:08 +04:00
serg@serg.mylan
47747685a3 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-18 11:04:36 +01:00
serg@serg.mylan
1c658417b1 make DROP DATABASE to behave as documented in the manual - to report number of files deleted 2004-03-18 11:03:24 +01:00
heikki@hundin.mysql.fi
2b16cf783f os0file.c:
Remove includes of sys/types.h and sys/stat.h because these are already included through univ.i
2004-03-18 08:26:49 +02:00
monty@mysql.com
19d0a60eca Don't change server suffix if given to configure
Portability fixes
2004-03-18 01:48:46 +02:00
monty@mysql.com
53c810cda4 merge fixes (use old code) 2004-03-18 00:16:04 +02:00
monty@mysql.com
f34a642d6e after merge fixes 2004-03-18 00:09:13 +02:00
heikki@hundin.mysql.fi
43706715da ha_innodb.cc:
Add a comment that InnoDB always retrieves the row id, if the clustered index was internally generated by InnoDB. Then we know the 'ref' to the row.
2004-03-17 22:28:49 +02:00
paul@teton.kitebird.com
24baf74c15 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-17 12:43:16 -06:00
paul@teton.kitebird.com
f71f714773 Fix typo. 2004-03-17 12:28:26 -06:00
heikki@hundin.mysql.fi
e8efe9c32a Many files:
Fix Bug #1942: do not retrieve all columns in a table if we only need the 'ref' of the row (usually, the PRIMARY KEY) to calculate an ORDER BY
2004-03-17 19:37:48 +02:00
paul@teton.kitebird.com
9bf6b3eaf9 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-17 11:15:36 -06:00
konstantin@mysql.com
b9f51f7081 WL #1510 "Implement support for "commercial" binaries on handshake",
client library:
- implemented 'check_license' function
2004-03-17 20:04:50 +03:00
vva@eagle.mysql.r18.ru
b28a13c028 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
2004-03-17 21:04:49 +04:00
vva@eagle.mysql.r18.ru
b42746f7eb fixed structure error from last merge for bug #2874 2004-03-17 21:01:07 +04:00
ram@gw.mysql.r18.ru
99d374159a merge 2004-03-17 18:57:51 +04:00
paul@teton.kitebird.com
60a3104b03 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-17 08:56:22 -06:00
ram@gw.mysql.r18.ru
bdd70d1cfd Added test case for the bug #3155: strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk;
(thankee Monty)
2004-03-17 18:43:58 +04:00
ram@gw.mysql.r18.ru
757cff9f9b Code cleanup:
- added unsigned_flag= 1; to Item_uint constructors
- removed Item_uint::fix_fields()
- added a comment about fix_fields() call
2004-03-17 18:40:04 +04:00
bell@sanja.is.com.ua
8035ce40ec DBUG_ASSERT(fixed == 0) added to fix_fields() 2004-03-17 14:26:26 +02:00
gluh@gluh.mysql.r18.ru
9863b6aed9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
2004-03-17 16:19:52 +04:00