Commit graph

12416 commits

Author SHA1 Message Date
pem@mysql.com
df69f93ae9 Post-merge post-merge fix (new error codes for fparser). 2004-05-14 16:10:31 +02:00
pem@mysql.comhem.se
ec92106535 Post-merge fixes.
Note: One sp.test still fails (prime), and rpl_server_id2.test fails (will be fixed by guilhem ASAP).
2004-05-14 16:00:57 +02:00
bell@sanja.is.com.ua
654bf99b94 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-parser-5.0
2004-05-12 12:28:51 +03:00
timour@mysql.com
9ca265785e Moved the declaration of status variable Last_query_cost to follow alphabetic order. 2004-05-12 09:52:35 +03:00
bell@sanja.is.com.ua
3c5cec08c0 file parser for new .frm 2004-05-11 23:23:49 +03:00
timour@mysql.com
f3dab7be12 Merge of WL#1469 with latest bk sources. 2004-05-11 12:15:58 +03:00
timour@mysql.com
eadcae3dc1 Merge of WL#1469 with latest bk version. 2004-05-11 12:12:32 +03:00
timour@mysql.com
a840d8daad Complete implementation of WL#1469 "Greedy algorithm to search for an optimal execution plan",
consisting of pos-review fixes and improvements.
2004-05-10 15:48:50 +03:00
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
bar@bar.intranet.mysql.r18.ru
df8e3eac45 ctype-win1250ch.c, ctype-czech.c:
Czech collations were renamed to _cs
Index.xml:
  Czech collation were renamed to _cs
2004-05-07 10:24:12 +05:00
monty@mysql.com
523c2935c9 Portablity fix for system with case insenstive table names. (Without this ALTER TABLE can fail for InnoDB) 2004-05-07 06:34:44 +03:00
monty@mysql.com
9e71351122 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-07 01:44:07 +03:00
monty@mysql.com
939ea71ecd Portability fixes
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
2004-05-07 01:43:17 +03:00
miguel@hegel.local
be8f7641ff Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.local:/home/miguel/bk/mysql-4.1
2004-05-06 18:48:34 -03:00
miguel@hegel.local
1106c26bea Windows VC++ compiler compatibility 2004-05-06 18:46:31 -03:00
bell@sanja.is.com.ua
cd24221017 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
2004-05-07 00:33:06 +03:00
bell@sanja.is.com.ua
c5d8497ee0 postreview fixes 2004-05-07 00:32:44 +03:00
bell@sanja.is.com.ua
a31452c512 fake_select_lex should be prepared during PS preparation to work correctly
item_list for fake_select will be created only once
(problem reported by valgrind in test_union2 fixed)
2004-05-07 00:08:21 +03:00
lenz@mysql.com
a0540f3c6f Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-05-06 21:40:22 +02:00
lenz@mysql.com
a320e554e6 - removed duplicate file ..\strings\strxnmov.c from the mysqlclient.dsp
that was accidently added by the last BK auto merge
2004-05-06 21:37:43 +02:00
konstantin@mysql.com
b58df2e9d4 mysql_stmt_reset now expects ok/error packet from server. 2004-05-06 22:44:00 +04:00
pem@mysql.com
db127864f6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2004-05-06 20:21:53 +02:00
pem@mysql.comhem.se
d02d105916 Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms. 2004-05-06 19:55:12 +02:00
monty@mysql.com
d5165650db Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-06 19:50:48 +03:00
lenz@mysql.com
f39c4012a3 - Windows compile fixes: added some missing files to the Windows Project
files, fixed linking of myisam_ftdump
2004-05-06 18:31:09 +02:00
miguel@hegel.local
510b5d9608 Windows VC++ compability fix 2004-05-06 13:28:16 -03:00
monty@mysql.com
28673669a4 Merge with 4.0 to get security patch for check_grant_colum 2004-05-06 13:42:26 +03:00
konstantin@mysql.com
57feb6625a Few cleanups to client_test.c 2004-05-06 13:49:20 +04:00
monty@mysql.com
f2991bc410 Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0 2004-05-06 11:42:35 +03:00
monty@mysql.com
a16c829c04 Remove not used variable 2004-05-06 11:42:23 +03:00
monty@mysql.com
c150453b42 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-06 04:41:09 +03:00
monty@mysql.com
f6dc9169e2 Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666)
The bug was introduced in a patch in the 4.1.2 source tree.
2004-05-06 04:40:45 +03:00
sergefp@mysql.com
ec33d794d8 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-code-cleanup
2004-05-06 01:06:18 +04:00
bell@sanja.is.com.ua
5030d28035 fixed test results 2004-05-05 23:29:35 +03:00
bell@sanja.is.com.ua
ae85306e19 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
2004-05-05 23:19:13 +03:00
guilhem@mysql.com
cd18476e34 Replication:
as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
2004-05-05 22:01:41 +02:00
guilhem@mysql.com
f7f7e725d6 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-05 21:51:26 +02:00
guilhem@mysql.com
d20230bcbe very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err,
and a comment update
2004-05-05 21:50:51 +02:00
bell@sanja.is.com.ua
26f0825cae merge 2004-05-05 22:30:01 +03:00
monty@mysql.com
4e2b94dea6 After merge fixes 2004-05-05 21:46:16 +03:00
monty@mysql.com
6827fe4086 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-05 21:24:45 +03:00
monty@mysql.com
a5d8b846fa after merge fixes 2004-05-05 21:24:21 +03:00
bell@sanja.is.com.ua
62fca61bc4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
2004-05-05 21:24:13 +03:00
bell@sanja.is.com.ua
c5c35c667e caching of queries with isammerge tables forbiden using general way
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update
2004-05-05 21:21:41 +03:00
sergefp@mysql.com
7c3376229e Make Item_param::val_int and Item_param::val_str follow the used convention and return 0 if null_value==1. 2004-05-05 20:04:25 +04:00
monty@mysql.com
d21d49a32a Merge with 4.0.19 2004-05-05 17:05:24 +03:00
miguel@hegel.local
4d8235b849 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.local:/home/miguel/bk/mysql-4.1
2004-05-05 10:55:39 -03:00
miguel@hegel.local
634a024fa9 Fixes for prior commit 2004-05-05 10:54:11 -03:00
marko@hundin.mysql.fi
d15b0b577d InnoDB portability fix: new function os_file_set_eof() 2004-05-05 15:54:28 +03:00
monty@mysql.com
e51887b050 Portability fix 2004-05-05 14:40:44 +03:00