Commit graph

16339 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
48f1ee6acf AIX compile fixes 2004-10-22 15:13:06 +00:00
ingo@mysql.com
20cea41f76 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug6151
2004-10-22 17:03:26 +02:00
mysqldev@mysql.com
36e59a681e remove compiler warnings 2004-10-22 16:57:19 +02:00
paul@ice.snake.net
cbaa07d78d handler.cc:
Typos in comments.
2004-10-22 09:19:08 -05:00
kent@mysql.com
90a8caee45 Merge 2004-10-22 15:41:56 +02:00
monty@mysql.com
97b4a3415d Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-10-22 14:59:59 +03:00
konstantin@mysql.com
f99d6ccfd0 A test case for Bug#6046: no fix is needed (the bug is already
fixed in the main tree).
2004-10-22 15:59:59 +04:00
konstantin@mysql.com
33c97a499b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6050
2004-10-22 15:59:58 +04:00
tomas@poseidon.ndb.mysql.com
c21b47540f fix c++ style comments in .h and .c files
compilation problems on some platforms'
2004-10-22 11:59:57 +00:00
konstantin@mysql.com
a7c52d755b A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field
names with ident. tables fr. diff. schemata": revise all uses of
Item_field and make them prepared-statements friendly when necessary.
2004-10-22 14:47:35 +04:00
joreland@mysql.com
e95f46bbd2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-10-22 11:01:11 +02:00
tomas@poseidon.ndb.mysql.com
6d0e947051 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-22 09:01:10 +00:00
tomas@poseidon.ndb.mysql.com
009bf31915 use the right make in make_binary_distribution 2004-10-22 08:57:52 +00:00
ram@gw.mysql.r18.ru
7590eed389 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2004-10-22 12:48:37 +05:00
ram@gw.mysql.r18.ru
b7c57329a4 A fix (bug #5999 Typo in code, wrong config variable naming). 2004-10-22 12:47:32 +05:00
heikki@hundin.mysql.fi
dd1b2ace33 os0file.c:
Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway
2004-10-22 10:45:00 +03:00
kent@mysql.com
21fd8948e6 Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/users/kboortz/daily/work/mysql-4.1-purify2
2004-10-22 08:57:20 +02:00
kent@mysql.com
bd3d0f6cea sql_parse.cc:
Bug#6167 One element missing in 'uc_update_queries[]'
2004-10-22 08:54:14 +02:00
bell@sanja.is.com.ua
7f896917b8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-view-5.0
2004-10-22 09:53:08 +03:00
jan@hundin.mysql.fi
baeecbd6e4 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
2004-10-22 07:58:04 +03:00
jan@hundin.mysql.fi
64061eea5a Show table status now shows creation time of the table for InnoDB. Note that
this timestamp might not be the correct time because e.g. ALTER TABLE
changes this timestamp.
2004-10-22 07:52:52 +03:00
kent@mysql.com
7a640b44dd mysqltest.c, mysqltest.result, mysqltest.test:
Added SQLSTATE matching support to test engine
mysqltest.result, mysqltest.test:
  new file
2004-10-22 05:56:27 +02:00
igor@rurik.mysql.com
4c605cece9 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2004-10-21 14:47:40 -07:00
igor@rurik.mysql.com
dd44a4b4d4 ps.result:
Post-merge fixes.
sql_select.cc:
  Post-merge cleanup.
2004-10-21 14:46:40 -07:00
heikki@hundin.mysql.fi
215cd1e4a3 row0mysql.c, row0ins.c:
Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users
2004-10-22 00:25:57 +03:00
bell@sanja.is.com.ua
ded12c828d Check of temporary tables hiding for query fetched from QC (BUG#6084) 2004-10-21 23:56:12 +03:00
tomas@poseidon.ndb.mysql.com
04b8a57b01 Compile fix 2004-10-21 20:49:37 +00:00
ingo@mysql.com
0d044c6869 BUG#6151 - myisam index corruption.
Removed the assumption of a certain key order.
Since 4.1, keys are padded with blanks for comparison.
Hence, shorter keys sort behind longer keys, if the
data bytes have values below BLANK.
2004-10-21 22:17:10 +02:00
tomas@poseidon.ndb.mysql.com
22d3333563 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-21 19:27:46 +00:00
tomas@poseidon.ndb.mysql.com
5c36f5b298 more snprintf... 2004-10-21 19:23:18 +00:00
tomas@poseidon.ndb.mysql.com
966067063a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-21 19:22:08 +00:00
tomas@poseidon.ndb.mysql.com
6e10fe2519 changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
bell@sanja.is.com.ua
ed7b229a28 added support of view and CHECK OPTION of view to LOAD DATA (BUG#5996) 2004-10-21 21:53:27 +03:00
dlenev@brandersnatch.localdomain
e6a44b719a Fix for bug #6116 "SET time_zone := ... requires access to
mysql.time_zone* tables".

We are excluding implicitly used time zone tables from privilege
checking.
2004-10-21 22:18:00 +04:00
tomas@poseidon.ndb.mysql.com
8224ef80e4 some platforms provide posix snprintf via special defined, these defines however cause problems elsewhere
so this is a way to only have to do this define in one file
2004-10-21 16:26:53 +00:00
serg@serg.mylan
318fe9db96 smarter ALTER TABLE - don't copy the table if only comment or default values are changed 2004-10-21 18:10:58 +02:00
konstantin@mysql.com
69a803c0ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6059
2004-10-21 20:00:54 +04:00
joerg@mysql.com
a7d054d18f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-10-21 17:57:48 +02:00
konstantin@mysql.com
9d73472840 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6059
2004-10-21 19:57:23 +04:00
joerg@mysql.com
a77d91e82e Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2004-10-21 17:47:05 +02:00
bell@sanja.is.com.ua
926537600e new behaviour of CHECK option build, for mor efficience and more correct:
check option build only according most top VIEW  CHECK OPTION TYPE  (BUG#5993)
2004-10-21 18:10:59 +03:00
heikki@hundin.mysql.fi
d2cc016f20 ha_innodb.cc:
Remove compiler warning 'skip_auto_inc_decr' : unreferenced local variable in Visual C++; of course, I still have to check Monty's auto-inc patch in whole
2004-10-21 18:01:13 +03:00
ram@gw.mysql.r18.ru
136652522e A fix (bug #6138: MOD operator should not round non-integral argument). 2004-10-21 19:52:55 +05:00
tomas@poseidon.ndb.mysql.com
95aad4450e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-21 14:52:11 +00:00
konstantin@mysql.com
a55e6dda22 Manual merge. 2004-10-21 18:44:40 +04:00
konstantin@mysql.com
49a58fc64e A fix and test case for bug#6059 "mysql_stmt_field_count returns
positive numbers when no resultset is available": when sending
result set metadata we need to use virtual select_result::send_fields, 
and not address protocol directly, because select_result descendents may 
intercept result set (it's the case for example for SELECT INTO OUTFILE).
2004-10-21 18:33:53 +04:00
bar@mysql.com
701b646374 ctype-uca.c:
Optimization: move "space padding" code outside the loop
2004-10-21 19:17:04 +05:00
jani@a80-186-41-201.elisa-laajakaista.fi
f3696879db Fixed Bug#6109, 'mysql' command line client segfaults on 'quit' command.
It also did not write ~/.mysql_history file. The problem was in alloc(),
which probably does not work on HP-UX-11.23 ia64 platform. Changed some
macros into functions for better maintenance and debugging.
2004-10-21 17:17:03 +03:00
tomas@poseidon.ndb.mysql.com
7f73c4bd1f one warning out, one warning in :-), forgot the argument in assert() 2004-10-21 14:17:02 +00:00
tomas@poseidon.ndb.mysql.com
7d4765544e workaround for Sun Forte compile problem for ndb on solaris 2.10 2004-10-21 14:11:20 +00:00