mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
13846 commits 2784 branches 343 tags 1.6 GiB
Commit graph

7056 commits

Author SHA1 Message Date
dlenev@brandersnatch.localdomain
ab8a72c7c7 Fixed compilation on windows. 2004-06-24 01:08:07 +04:00
serg@serg.mylan
2c48e052d9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-06-23 21:47:07 +02:00
serg@serg.mylan
9f45c9e399 followup to handler cleanup 2004-06-23 21:26:34 +02:00
bell@sanja.is.com.ua
2f5c9b7aa5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
 2004-06-23 18:58:52 +03:00
lenz@mysql.com
79739b30e2 - fixed a compile error on Windows (incompatible cast) 2004-06-23 16:57:34 +02:00
monty@mysql.com
cd049201f6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-23 17:13:27 +03:00
serg@serg.mylan
cfd7859565 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-06-23 16:13:26 +02:00
bar@mysql.com
b42fc1e77c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-06-23 19:13:26 +05:00
gluh@gluh.mysql.r18.ru
3bcbdcb406 Fix for bug#3950: Check/Repair caused by "Field List" doesn't show table name in processlist 2004-06-23 18:13:25 +04:00
monty@mysql.com
580cb3ddee Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-06-23 16:44:54 +03:00
monty@mysql.com
ad86016e2f lower_case_table_names=2 (Keep case for table names) was not honored 
with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
Make net_buffer_length visible for mysql clients (Bug #4206)
 2004-06-23 16:44:34 +03:00
monty@mysql.com
d0507ca7f3 Fixed warning about unitialized mutex when mysqld couldn't start. 2004-06-23 16:39:56 +03:00
bar@mysql.com
97bdd97c8a log.cc: 
rpl_charset failed on  Linux/AMD64.
 2004-06-23 18:34:26 +05:00
serg@serg.mylan
c03addab79 merged 2004-06-23 12:36:07 +02:00
serg@serg.mylan
3f1c4ba745 handler interface cleanups: 
more logical table/index_flags
  return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
  max_keys and other limits renamed to max_supported_keys/etc
  max_keys/etc are now wrappers to max_supported_keys/etc 
  ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing
 2004-06-23 12:29:05 +02:00
dlenev@brandersnatch.localdomain
60404d2c37 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-am
 2004-06-23 13:07:33 +04:00
dlenev@brandersnatch.localdomain
47e03a0099 Final solution to mysql_tzinfo_to_sql problem. 2004-06-23 13:07:00 +04:00
ram@gw.mysql.r18.ru
382ed47f5b A fix (Bug #4237: Server crash with a subquery SELECT). 
Original test case was too big to add it.
Unfortunately I didn't manage to reduce it.
 2004-06-23 13:40:59 +05:00
sergefp@mysql.com
9c2a961a63 Fix and test case for BUG#3899 2004-06-23 11:40:42 +04:00
pem@mysql.com
97caae5109 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/pem/work/mysql-4.1
 2004-06-23 09:07:14 +02:00
dlenev@brandersnatch.localdomain
c110ec1a22 Fix for build from bk failures with old automake. 
mysql_tzinfo_to_sql converter was moved to extra/ directory and its build was made 
compatible with older automake versions.
 2004-06-22 23:36:26 +04:00
pem@mysql.comhem.se
34ddd9c515 Fixed BUG#3486: FOUND_ROWS() fails inside stored procedure [and prepared statement]. 2004-06-22 19:38:07 +02:00
dlenev@brandersnatch.localdomain
b20dca925d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4200
 2004-06-22 19:28:01 +04:00
ingo@mysql.com
e1cd282ea2 bug#2688 - Wrong index_merge query results for BDB table with variable length primary key. 
dded code to clear the tail of the reference buffer if the actual key length 
is less than the maximum key length.
 2004-06-22 17:27:57 +02:00
dlenev@brandersnatch.localdomain
eea19e5235 Fix for Bug# 4200 "Parse error on LIKE ESCAPE with parameter binding" 
Now ESCAPE in LIKE will accept not only string literal but constant 
delimited expression.
 2004-06-22 19:27:16 +04:00
bell@sanja.is.com.ua
e71b693115 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-regexp-4.1
 2004-06-22 15:17:40 +03:00
bell@sanja.is.com.ua
5ed07df98a Merge 2004-06-22 13:48:51 +03:00
ram@gw.mysql.r18.ru
dc6465cc38 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4102
 2004-06-22 15:41:51 +05:00
bell@sanja.is.com.ua
fe3f6f4c36 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
 2004-06-22 13:22:00 +03:00
ram@gw.mysql.r18.ru
f3d11147c9 after merge fix 2004-06-22 14:48:29 +05:00
bell@sanja.is.com.ua
cb0f607c5e Merge 2004-06-22 12:38:23 +03:00
dlenev@brandersnatch.localdomain
4f8294f2ff Removed building of test_time test since it was not needed/used really and caused problems 
on many platforms (the other option was providing portable setenv() replacement).
 2004-06-22 13:19:25 +04:00
konstantin@mysql.com
3f53a1cb44 Fix for bug#4236 "Server crash on attempt to execute non-prepared 
statement": check that statement is not null when accessing it's name.
 2004-06-22 11:04:41 +04:00
ram@gw.mysql.r18.ru
b929db876d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4198
 2004-06-22 10:58:16 +05:00
sergefp@mysql.com
72d8f71f54 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-root
 2004-06-22 05:11:59 +04:00
sergefp@mysql.com
f874071a26 Range optimizer fix: 
If cost(full_scan_on_shortest_covering_index) < cost(best_range_scan) <  cost(full_table_scan)
  use full_scan_on_shortest_covering_index
(before this fix best_range_scan was used)
 2004-06-22 04:47:28 +04:00
sergefp@mysql.com
19616945ab Coding style fixes 2004-06-22 03:25:54 +04:00
dlenev@brandersnatch.localdomain
67b4ec0c38 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-cleanup
 2004-06-22 03:14:50 +04:00
dlenev@brandersnatch.localdomain
ea36bd3c78 Small cleanup in time zone handling code: 
Now we are using time zone abbreviations in debug builds or in utlities only.
Tried to remove warnings generated by compiler by using more proper types for
members of time zone describing structures. Removed unused variables. 
Fixed test_time to be able to build on FreeBSD without much problems.
Portability fix: resolved ambiguity of abs() function.
 2004-06-22 03:10:30 +04:00
bell@sanja.is.com.ua
a6df8e743a fixed picture in comment. 2004-06-22 00:00:36 +03:00
serg@sergbook.mysql.com
6adefe41a4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2004-06-21 19:44:20 +03:00
serg@sergbook.mysql.com
e2a3ca8637 use ref not range for ... WHERE key IN (val) 2004-06-21 19:42:00 +03:00
konstantin@mysql.com
b793142c8f Unused variables removed (many files). 2004-06-21 20:39:19 +04:00
ram@gw.mysql.r18.ru
df727fbb65 a fix (bug #4198: Incorrect key file for table). 2004-06-21 15:17:07 +05:00
monty@mysql.com
030f091319 Field_geom should have same max_length as Field_blob 
Updated tests
After merge fix
 2004-06-21 11:27:40 +03:00
monty@mysql.com
d69a36d118 merge 2004-06-21 10:24:40 +03:00
monty@mysql.com
1388c164bc After merge fixes 
Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
 2004-06-21 10:21:20 +03:00
bell@sanja.is.com.ua
2a3d5308df do not clear list of changed tables on one statement rollback (Bug #4213) 2004-06-20 23:44:21 +03:00
guilhem@mysql.com
f5d6424487 Robustness feature. 
Won't be pushed as is - separate email sent for internal review.
WL#1717 "binlog-innodb consistency".
Now when mysqld starts, if InnoDB does a crash recovery, we use the binlog name
and position retrieved from InnoDB (corresponding to the last transaction
successfully committed by InnoDB) to cut any rolled back transaction from
the binary log. This is triggered by the --innodb-safe-binlog option.
Provided you configure mysqld to fsync() InnoDB at every commit (using
flush_log_at_trx_commit) and to fsync() the binlog at every write
(using --sync-binlog=1), this behaviour guarantees that a master always has
consistency between binlog and InnoDB, whenever the crash happens.
6 tests to verify that it works.
 2004-06-20 19:11:02 +02:00
bell@sanja.is.com.ua
a19b0f0a8e cleanup for Item_func_regex (Bug #4199) 2004-06-19 13:26:39 +03:00
guilhem@mysql.com
6b45c24d39 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-18 23:51:15 +02:00
guilhem@mysql.com
19dbf58eec API change: mysql_shutdown() now requires a 2nd argument, the shutdown level. 
mysqld >=4.1.3 will however understand shutdown requests sent by clients <4.1.3.
And mysqld <4.1.3 will understand shutdown requests sent by clients >=4.1.3
(it will ignore the level). Those shutdown level are just PLACEHOLDERS now.
So this change is just to make the 4.1 API suitable before it is frozen. Later
we will actually implement the shutdown levels.
 2004-06-18 23:50:04 +02:00
dlenev@brandersnatch.localdomain
e8891ee926 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-push
 2004-06-18 10:12:21 +04:00
dlenev@brandersnatch.localdomain
09ba29e539 WL#1264 "Per-thread time zone support infrastructure". 
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
  
WL#1266 "CONVERT_TZ() - basic time with time zone conversion 
function".
  
Fixed problems described in Bug #2336 (Different number of warnings 
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated 
at Field object level not in conversion functions).
  
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
 2004-06-18 10:11:31 +04:00
monty@mysql.com
b11d258835 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
konstantin@mysql.com
7bbdb8408b Fix for bug#4105 "Server crash on attempt to prepare a statement with 
character set introducer": add new item type to be returned before from 
Item_param until it's value is set.
This way items like Item_bool_func2 and udf_handler won't treat this item
as constant literal when statement is prepared.
 2004-06-18 04:16:08 +04:00
monty@mysql.com
fd0153304d Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173) 
Fixed problem with NULL and derived tables (Bug #4097)
Cleanup of new pushed code
 2004-06-18 03:02:29 +03:00
monty@mysql.com
fd6858dccd Fixed unlikely bug in the range optimzer when using many IN() queries on different key parts. (Bug #4157) 2004-06-18 02:31:11 +03:00
bell@sanja.is.com.ua
96b470ae59 after review fix (BUG#4067) 2004-06-17 13:48:31 +03:00
bell@sanja.is.com.ua
523dbb3ef9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-06-17 12:03:00 +03:00
paul@kite-hub.kitebird.com
233ad19e01 Error message edits. 2004-06-16 11:59:35 -05:00
paul@kite-hub.kitebird.com
9db51b66f9 Error message edits. 2004-06-16 11:23:06 -05:00
bar@mysql.com
f814d224f7 Critical fixes after review: 
- mutex was unlocked before the end of the critical sesion,
- Portability issue: It's better to use (*alloc)(x) instead of alloc(x),
  if alloc is a function passed as an argument.
- Use {} around if() block, to avoid possible problems with some Windows compilers.
 2004-06-16 19:06:45 +05:00
ram@gw.mysql.r18.ru
6b8222d3a7 a fix (Bug #4102 Crash with a DBUG window after a request) 2004-06-16 18:43:05 +05:00
bell@sanja.is.com.ua
002364c20f new length detection for non-string in UNION (BUG#4067) 2004-06-16 16:06:30 +03:00
serg@sergbook.mysql.com
47482dc40d minor cleanup 2004-06-16 12:51:59 +03:00
paul@ice.snake.net
877d44dae9 Language/consistency edits to error messages. 2004-06-15 23:23:56 -05:00
paul@ice.snake.net
fd1d01e098 Language/consistency edits to error messages 
and affected test results.
 2004-06-15 22:18:20 -05:00
paul@kite-hub.kitebird.com
f4dbb250fd Language/consistency edits to error messages 
and affected test results.
 2004-06-15 15:38:36 -05:00
pem@mysql.comhem.se
ecd424ac58 Fixed BUG#3339: Stored procedures in nonexistent schemas are uncallable. 
Also added some related security tests and corrected related error messages.
 2004-06-15 15:42:28 +02:00
pem@mysql.comhem.se
26ec49f1a8 Fixed BUG#3368: Stored procedure crash if group_concat(variable). 2004-06-15 14:26:19 +02:00
ram@gw.mysql.r18.ru
5647996784 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4035
 2004-06-15 16:03:16 +05:00
ram@gw.mysql.r18.ru
438a7d0162 We don't need tmp_value member in the Item_func_left. 2004-06-15 16:01:43 +05:00
guilhem@mysql.com
f1fda6387e API change: mysql_shutdown() now needs a 2nd parameter, the shutdown level. 
Server will however still accept shutdown without specified level; so that old
mysqladmin can still shut server down.
I would like your comments on the names of shutdown level which I chose. You
are welcome to propose better names. Please however check WL#709 before.
Reason for the names I propose is to be accurate, thus leaving possibility
for other levels which we may imagine in the future; that's why I have rejected
names like "fast", "smart", "graceful" so far. My position is that WAIT_ALL_BUFFERS
or WAIT_CRITICAL_BUFFERS say what the shutdown does, whereas for "smart", "fast" you
need to remember what it does.
This should be pushed in 4.1.3 but only after your comments.
 2004-06-15 11:35:23 +02:00
pem@mysql.com
00d5d92550 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0-merge
 2004-06-14 12:39:37 +02:00
pem@mysql.comhem.se
ad19125447 Fixed BUG#3843: ANALYZE TABLE inside stored procedure causes 'Packets out of order' error. 2004-06-14 12:38:54 +02:00
sergefp@mysql.com
cd98a2d82d Post-merge fixes 2004-06-14 12:39:46 +04:00
sergefp@mysql.com
ee0a516ccd Manual merge 2004-06-14 11:18:56 +04:00
bell@sanja.is.com.ua
d2c585df31 fixed field resolving mode fo INSERT/REPLACE and CRETE with SELECT (BUG#4090) 2004-06-13 22:39:09 +03:00
serg@serg.mylan
516bcf508c after merge fix 2004-06-11 21:20:53 +02:00
serg@serg.mylan
035e03c1f6 merged 2004-06-11 20:55:08 +02:00
hf@deer.(none)
1bedda6072 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.4014
 2004-06-11 23:00:49 +05:00
bar@mysql.com
c64d93b274 Allocate memory when a character set is requested: 
- For simple character sets: from_uni convertion table.
- For UCA: alternative weight arrays.
Use mbminlen instead of MY_CS_NONTEXT
 2004-06-11 16:29:16 +05:00
heikki@hundin.mysql.fi
124c2ef4f0 ha_innodb.cc: 
Put back the ha_innodb.cc source code lines that were accidentally removed in Jan Lindstrom's push yesterday (he used the account heikki@mysql.com)
 2004-06-11 10:21:22 +03:00
igor@rurik.mysql.com
84e55cfc89 sql_yacc.yy: 
Correction for nested joins.
 2004-06-10 23:40:55 -07:00
igor@rurik.mysql.com
356cbe4fa2 join_nested.test, join_nested.result: 
new file
Many files:
  Nested joins added.
 2004-06-10 22:27:21 -07:00
konstantin@mysql.com
0276d38f64 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2004-06-11 00:20:18 +04:00
konstantin@mysql.com
f08bbd1f12 assert.h needed for my_dbug.h now is included in my_dbug.h, where it for 
some reason wasn't included before.
A lot of files cleaned up from #include <assert.h>
 2004-06-10 23:58:39 +04:00
serg@serg.mylan
78fa465b92 bug#3964 and related issues: FTB problems with charsets where one byte can match many 
correct prefix compare with my_strnncoll
 2004-06-10 21:18:57 +02:00
bell@sanja.is.com.ua
be642b9bcd EXISTS(SELECT * ...) 
close table before opening in optimize
 2004-06-10 21:33:15 +03:00
bell@sanja.is.com.ua
5f235eb828 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-count-4.1
 2004-06-10 18:58:53 +03:00
pem@mysql.comhem.se
078f717804 Fixed BUG#3132: Stored function returns empty when used in union. 2004-06-10 17:07:53 +02:00
guilhem@mysql.com
3d33dc7c77 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-10 16:42:07 +02:00
guilhem@mysql.com
e816a757db WL#1689 "Map OPTIMIZE TABLE to ALTER TABLE for InnoDB" 
exactly it's mapped to "ALTER TABLE t; ANALYZE TABLE t;"
 2004-06-10 16:41:24 +02:00
bar@mysql.com
34d413a6a0 Optimization to use less memory. 2004-06-10 19:10:21 +05:00
guilhem@mysql.com
73411a2ed5 WL#1595 "Optionally fsync() the binlog after every statement": 
New option --sync-binlog=x (and global settable variable) which will fsync the binlog
after every x-th disk write to it. That is, if in autocommit mode, after every x-th statement
written to the binlog; if using transactions, after every x-th transaction written to the binlog.
x==0 means no fsync. x==1 is the slowest.
There is no test added for this, I have just checked that it works as --sync-binlog=1 dramatically
slows down mysqld.
Made sync-frm a global settable variable.
 2004-06-10 15:56:13 +02:00
monty@mysql.com
30bed1bbf9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-06-10 16:44:55 +03:00
guilhem@mysql.com
ec5b55f8e1 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-1595
 2004-06-10 15:10:44 +02:00
guilhem@mysql.com
10429acb8e don't need to tag the slave SQL thread as "bootstrap". It causes duplicate 
error messages when a query goes wrong.
Note that from now on, if you run with --slave-skip-error=xx, then nothing will
be printed to the error log when the slave is having this error xx and
skipping it (but you don't care as you want to skip it).
 2004-06-10 14:03:25 +02:00
heikki@hundin.mysql.fi
4a5077a0dd Added function 
/***********************************************************************
This function stores binlog offset and flushes logs */


void innobase_store_binlog_offset_and_flush_log(char *binlog_name,longlong offset) 
requested by Guilhem to ha_innodb.cc and ha_innodb.h. 

Change made by Jan.Lindstrom@innodb.com
 2004-06-10 15:01:16 +03:00
serg@serg.mylan
3d36d97efb Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-06-10 13:58:32 +02:00
serg@serg.mylan
5647809350 warn about multiple mysqld --user parameters only if their arguments differ 2004-06-10 13:56:58 +02:00
pem@mysql.comhem.se
f467e0b354 Removed extra error messages (that were replaced). 2004-06-10 12:17:13 +02:00
monty@mysql.com
17db9de543 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-06-10 12:36:11 +03:00
monty@mysql.com
ff223db0fe Merge with 3.23 to get latest bug fixes 2004-06-10 11:59:45 +03:00
monty@mysql.com
c56a16b598 Cleanup 2004-06-10 11:58:16 +03:00
bell@sanja.is.com.ua
ba82b9e7d5 cleunup() of count() and max()/min() added (BUG#2687) 2004-06-10 10:59:55 +03:00
bell@sanja.is.com.ua
98a7b49dc5 do not unlock tables early if we have subquery in HAVING clause (BUG#3984) 2004-06-09 23:32:20 +03:00
hf@deer.(none)
4506aba179 Fix for the bug #4014 (prepared SELECT in embedded server) 
Problem is that store_string_aux calls 'wrong' net_store_data
 2004-06-09 22:36:48 +05:00
guilhem@mysql.com
aa3c80fb7d Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-09 16:24:35 +02:00
guilhem@mysql.com
2b20e84ff8 Making DROP TABLE IF EXISTS, DROP DATABASE IF EXISTS, DELETE FROM, UPDATE be logged to 
binlog even if they changed nothing, and a test for this.
This is useful when users use these commands to clean up their master and slave by issuing
one command on master (assume master and slave have slightly different data for some
reason and you want to clean up both).
Note that I have not changed multi-table DELETE and multi-table UPDATE because their
error-reporting mechanism is more complicated.
 2004-06-09 16:07:01 +02:00
guilhem@mysql.com
9799c5ba33 complement to previous fix (which was for SQLCOM_DROP_DB), for COM_DROP_DB. 2004-06-09 15:27:15 +02:00
guilhem@mysql.com
e76a332165 Fix for BUG#4066 "DROP DATABASE case sensitive even if lower-case-table-names > 0" 2004-06-09 15:22:31 +02:00
pem@mysql.com
7aa3207cb3 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0-merge
 2004-06-09 14:44:44 +02:00
pem@mysql.comhem.se
cc897576fe Fixed BUG#2564: SHOW CREATE inconsistent W.R.T ANSI_QUOTES. 
It's not possible to quote the definition according to the current sql_mode
setting, so instead we use the setting stored with the SP (that's how it's
parsed anyway), and show this setting in the SHOW CREATE output.
 2004-06-09 14:19:43 +02:00
monty@mysql.com
d8b6322860 Merge 2004-06-09 12:34:22 +03:00
konstantin@mysql.com
f3e018f833 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-4026
 2004-06-09 03:22:55 +04:00
konstantin@mysql.com
dc11d3cfa1 Proposed fix for Bug#4026 "Microseconds part of TIME/DATETIME types 
is broken (prepared statements)": fixed date handling in many places 
of prepared statements code.
 2004-06-09 03:21:50 +04:00
serg@serg.mylan
a8a8da3920 different (simpler and more compatible) fix for bug#4046 2004-06-09 00:08:24 +02:00
guilhem@mysql.com
c75b24a73a Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-08 19:55:35 +02:00
guilhem@mysql.com
b514e6a8c5 Correction to replication of charsets in 4.1: 
In mysqlbinlog, there was a problem with how we escaped the content of a string user variable.
To be perfect, we should have escaped with character_set_client. But this charset is unknown
to mysqlbinlog. So the simplest is to print the string in hex. This is unreadable but
100% safe with any charset (checked with Bar), no more need to bother with character_set_client.
 2004-06-08 19:55:04 +02:00
pem@mysql.comhem.se
e3132d9a7c Fixed proper restoring of current db on errors. 
This fixes part of BUG#3229: Stored procedure comment causes packets out of order.
 2004-06-08 18:41:18 +02:00
bell@sanja.is.com.ua
6ab2d24ad8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-06-08 17:09:59 +03:00
ram@gw.mysql.r18.ru
71eee450e0 a fix 
(Bug #4035 GROUP_CONCAT with HAVING clause truncates field                       
Bug #4057 LEFT() function in HAVING clause truncates query result).
 2004-06-08 18:01:15 +05:00
jplindst@t41.(none)
d6e1e47bbe Added function innobase_store_binlog_offset_and_flush_log requested by Guilhem 
to ha_innodb.cc and ha_innodb.h
 2004-06-08 15:38:22 +03:00
bar@bar.intranet.mysql.r18.ru
500874b554 Bug #3717 ENCODE returns a character string, not a binary string 2004-06-08 15:36:44 +05:00
bar@bar.intranet.mysql.r18.ru
7d33346854 Bug #2077 Japanese characters in enum/default values are reported incorrectly 2004-06-08 14:26:16 +05:00
heikki@hundin.mysql.fi
d9dc42b5be ha_innodb.cc: 
Fix Bug #4047: remove the improvement ported from 4.0 that made InnoDB to remember the original select_lock_type inside LOCK TABLES
 2004-06-08 10:41:14 +03:00
wax@mysql.com
708931fa27 Merge mysql.com:/home/wax/mysql/mysql-5.0 
into mysql.com:/home/wax/mysql/mysql-5.0service
 2004-06-08 12:44:02 +06:00
bell@sanja.is.com.ua
273b74c836 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-06-07 23:43:04 +03:00
sergefp@mysql.com
26a5650d1b SQL Syntax for Prepared Statements: post-merge fixes 2004-06-08 00:43:03 +04:00
sergefp@mysql.com
7e0455f333 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-07 23:50:59 +04:00
bell@sanja.is.com.ua
415e7c6fd2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-06-07 21:31:54 +03:00
gluh@gluh.mysql.r18.ru
5725831c73 Fix for bug #4036 multiple SELECT DATE_FORMAT, incorrect results 2004-06-07 20:35:05 +04:00
gluh@gluh.mysql.r18.ru
147c2988cc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
 2004-06-07 19:58:34 +04:00
gluh@gluh.mysql.r18.ru
d381736c31 Fix for bug#3946: Error in LPAD() when padstring is longer than 1 character 2004-06-07 17:39:17 +04:00
bar@bar.intranet.mysql.r18.ru
7d17da9018 mysqld.cc: 
WL#1160.
  Adding variable-conformant startup options for --default-character-set and --default-collation
 2004-06-07 18:33:17 +05:00
serg@serg.mylan
5d947f7b97 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-06-07 12:39:26 +02:00
serg@serg.mylan
86e9dc29b0 BUG#3987 - if(int, aggregate(int)) 2004-06-07 12:38:35 +02:00
pem@mysql.com
f87f27915e Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0-merge
 2004-06-07 12:09:17 +02:00
pem@mysql.comhem.se
12b65b31b8 Post-merge fixes. 2004-06-07 12:08:13 +02:00
brian@brian-akers-computer.local
589480e879 Last patch before push into main tree. Updated from code review and final once over. 
A couple of small changes to ha_example (mainly comments).
 2004-06-07 02:06:33 -07:00
sergefp@mysql.com
916579e3fd Merged 2004-06-07 12:21:26 +04:00
sergefp@mysql.com
1e05e6cb82 Post review fixes for "SQL Syntax for Prepared Statements". 2004-06-07 12:09:10 +04:00
bell@sanja.is.com.ua
eeddb00234 fixed mistyping 2004-06-07 01:06:17 +03:00
brian@brian-akers-computer.local
34ad857c8d Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-06-05 22:58:13 -07:00
konstantin@mysql.com
231ec66652 More comments in prepared statements code. 2004-06-06 00:33:16 +04:00
brian@brian-akers-computer.local
e24e1350a3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-06-05 10:43:22 -07:00
paul@kite-hub.kitebird.com
d77a3f6db1 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2004-06-04 10:35:57 -05:00
monty@mysql.com
8b2a735563 Portability fixes (and a typo after last merge) 2004-06-04 11:02:35 +03:00
sergefp@mysql.com
bec20d1fd7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-04 05:37:14 +04:00
guilhem@mysql.com
da835a0a06 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2004-06-03 23:19:01 +02:00
guilhem@mysql.com
86e8ecc965 Implementation of WL#1824 "Add replication of character set variables in 4.1", 
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill. 
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput  if query uses
 variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
 properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
 2004-06-03 23:17:18 +02:00
pem@mysql.comhem.se
3dcd7e53af Post-merge fixes. 
Not finished, will not be pushed until additional fixes have been made.
 2004-06-03 19:36:36 +02:00
sergefp@mysql.com
bd04f52552 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-03 20:54:46 +04:00
paul@kite-hub.kitebird.com
2f0ca1ce42 Fix skipp -> skip once and for all. 
(Note: This affects only comments, not variable names.)
 2004-06-03 11:52:54 -05:00
bell@sanja.is.com.ua
73964382a7 removed incorrect destructor (to prevent deleting item by recursion instead of by list scanning in case of chained OR or AND) 2004-06-03 15:38:38 +03:00
hf@deer.(none)
b8cf9f6afe Merging 2004-06-02 19:17:35 +05:00
monty@mysql.com
4cb62eb001 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-02 12:14:36 +03:00
monty@mysql.com
e6c5715126 after merge fixes 2004-06-02 12:13:49 +03:00
serg@serg.mylan
dc5a7f8030 cleanup 2004-06-02 00:27:59 +02:00
serg@serg.mylan
6341c93d77 check_scramble_323 shuold ensure that the scramble has the correct length 2004-06-01 23:58:33 +02:00
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
monty@mysql.com
53d05f4adb Removed compiler warnings 2004-06-01 23:39:39 +03:00
monty@mysql.com
197fcf1ee4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-01 22:30:03 +03:00
monty@mysql.com
017096695a Update version number 
Fixed serbian error messages
Fix for windows regarding changed variable name
 2004-06-01 22:29:46 +03:00
hf@deer.(none)
12c217bb21 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.ftr
 2004-06-01 22:47:28 +05:00
hf@deer.(none)
39f69a2126 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.ftr
 2004-06-01 22:37:39 +05:00
hf@deer.(none)
de5feec001 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.3412
 2004-06-01 21:52:42 +05:00
heikki@hundin.mysql.fi
aac5c88bcd row0mysql.c, row0mysql.h, ha_innodb.cc: 
Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
 2004-06-01 19:19:48 +03:00
jani@a80-186-24-72.elisa-laajakaista.fi
2953c23ab0 Changed --log-warnings to be integer instead of boolean. Given --skip-log-warnings 
will disable warnings, --log-warnings will increment warning level by one, or the
level can be given as an optional argument. Default level is 1.

Changed aborted connection warning to be logged only if the level is > 1.
 2004-06-01 17:29:24 +03:00
sergefp@mysql.com
dc38512390 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-01 17:29:13 +04:00
sergefp@mysql.com
e3b03d7a08 * New, binlog-aware character sets support in SQL Syntax for Prepared statements. 
* The prepared statement query is put into binary log on execution only if it is an update query.
 2004-06-01 17:27:40 +04:00
sergefp@mysql.com
2e93dfaf42 More code cleanup, debug prints removed 
Fixed an incorrect optimizer choice for ror-intersect(key, clustered_primary)
Typo bug fixed in multitable update
 2004-06-01 15:31:58 +04:00
bell@sanja.is.com.ua
4c8387706a correct table_hash_search call 2004-05-31 21:10:15 +03:00
marko@hundin.mysql.fi
df8f605609 InnoDB: Do not get a lock for consistent reads (Bug #3894) 2004-05-31 16:33:45 +03:00
konstantin@mysql.com
eaa4d106e6 Fix for Bug#3796 "Prepared statement, select concat(<parameter>,<column>), wrong 
result": new Item_param member for use in val_str()
 2004-05-31 14:21:48 +04:00
sergefp@mysql.com
5843eec521 Manual merge 2004-05-29 20:55:46 +04:00
serg@serg.mylan
5bd03da8b2 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-05-29 17:53:01 +02:00
serg@serg.mylan
2e1ded2fe1 backport wild_compare fix from 4.1 - bug#3924 2004-05-29 17:52:20 +02:00
sergefp@mysql.com
742b759df7 * Undo of range optimizer fix from previous changeset 
* Fixed test results.
 2004-05-29 17:50:05 +04:00
sergefp@mysql.com
dff98a8ef7 * New index_merge EXPLAIN output format 
* Fixed a problem with wrong query results for partially covering keys in ROR-index_merge
 * ROR-intersection retrieval plan choice algorithm now uses less disk IO
   - and properly processes clustered PK range scans 
 * Fixed several minor range optimizer problems
 * Added more comments
 * Code cleanup
 2004-05-29 02:04:01 +04:00
monty@mysql.com
f0f76efaa6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-28 21:58:57 +03:00
pem@mysql.comhem.se
27abb69250 Fixed BUG#2460: Crash wih Stored Procedure and UNION. 2004-05-28 19:43:06 +02:00
pem@mysql.comhem.se
a4729a9052 Added test cases for the following bugs that have been fixed by recent changes: 
BUG#1863: CREATE TABLE in Stored Procedure sometimes crashes on repeated calls.
 BUG#2656: select with join in stored procedure: erroneous result on 2nd call.
 BUG#3426: IF x IS NULL in stored procedure fails on second call within connection.
 BUG#3448: Stored Procedures with inner joins possible bug.
 BUG#3734: Stored procedure returns wrong rows with fulltext parameter.
 BUG#3863: Stored procedure crash when incrementing variable in a loop.

(And corrected the row count output to the client after CALL)
 2004-05-28 18:33:14 +02:00
hf@deer.(none)
38334f62a4 Proposed fix for bug #3412 (embedded server: prepared statement returns 
empty recordset where some records should be found)
 2004-05-28 15:59:29 +05:00
msvensson@build.mysql.com
c98a895462 ha_ndbcluster.cc: 
Missing  semicolon
 2004-05-28 12:09:12 +02:00
ram@gw.mysql.r18.ru
605962a938 a fix. 
(Bug#3738: SQL_CALC_FOUND_ROWS ignores WHERE if LIMIT used,
 Bug#3845: wrong FOUND_ROWS result)
 2004-05-28 15:01:16 +05:00
monty@mysql.com
aabbacba8f New patch to ensure that InnoDB gets values for CFLAGS and CXXFLAGS 2004-05-28 10:41:38 +03:00
hf@deer.(none)
15ea09b79d WL#1163 (Make spatial code separable for other parts) 
--with-geometry and
--with-embedded-privilege-control
configure switches added
 2004-05-27 20:31:30 +05:00
dlenev@brandersnatch.localdomain
03b705ff44 Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should 
produce hex digits in lower case). (fixed version)

Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.
 2004-05-27 17:54:40 +04:00
marko@hundin.mysql.fi
fc85c80b88 InnoDB cleanup: 
Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
Remove (char*) casts of string constants; add const qualifiers
Remove some Hot Backup code unless #ifdef UNIV_HOTBACKUP
 2004-05-27 15:27:43 +03:00
hf@deer.(none)
374a28d293 Merging 2004-05-27 16:32:49 +05:00
monty@mysql.com
61a6557307 merge with 4.0 to get windows fixes 2004-05-27 00:30:28 +03:00
monty@mysql.com
dab0b7d415 VC++ portability fix 2004-05-26 21:45:58 +03:00
hf@deer.(none)
78f58ff384 Fix to make Windows compilation smoother 2004-05-26 21:40:27 +05:00
monty@mysql.com
98741a50df Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-26 19:13:12 +03:00
monty@mysql.com
7d8f8bc77b Changed prototype of killed_ptr() to make it more portable 
Applied patches for Netware
 2004-05-26 19:12:49 +03:00
pem@mysql.com
71eddc362e Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
magnus@neptunus.(none)
595cd3f5f1 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-26 14:29:53 +02:00
magnus@neptunus.(none)
2daebc70cc Fix after running on a 4-node system. 2004-05-26 14:22:49 +02:00
bell@sanja.is.com.ua
350d8a215b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sp2_bak-5.0
 2004-05-26 14:59:42 +03:00
bell@sanja.is.com.ua
e822f61d76 cleunup items of instruction after every instruction execution 2004-05-26 14:28:35 +03:00
brian@brian-akers-computer.local
fee4ed7f1c Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-05-25 14:53:55 -07:00
brian@avenger.(none)
72e7d69674 Added tests for archive. Cleaned up a merge mistake and added some information on how well archive compresses. 2004-05-25 13:27:01 -07:00
monty@mysql.com
390d9898f9 merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
bell@sanja.is.com.ua
5e83cf32a6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sp2-5.0
 2004-05-25 22:40:37 +03:00
monty@mysql.com
ca8dbc24ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/tmp/skr99/mysql-4.0
 2004-05-25 22:01:50 +03:00
monty@mysql.com
f2e1e3ce4c Added patches from Novell 2004-05-25 22:00:14 +03:00
pem@mysql.com
d65226c9ff Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0-merge
 2004-05-25 19:51:11 +02:00
pem@mysql.comhem.se
5cbe0fb8ed Added frame offset to debug pring of local SP variables. 2004-05-25 19:46:21 +02:00
bell@sanja.is.com.ua
1f2e37d4f0 my_b_write() needs to be replaced with my_b_append() for a SEQ_READ_APPEND 2004-05-25 18:57:30 +03:00
konstantin@mysql.com
4eaac5fa56 changed comment for LONG_DATA_COMMAND 2004-05-25 19:52:05 +04:00
magnus@neptunus.(none)
28c8ac884b Corrected index_flags returned when index are created with USING HASH 
Updated ndb_ test cases
 2004-05-25 14:40:51 +02:00
bar@bar.intranet.mysql.r18.ru
d0c761e66b sql_string.h: 
Not used code.
  ,
sql_string.cc:
  Not used code.
 2004-05-25 16:05:33 +05:00
bar@bar.intranet.mysql.r18.ru
3f8996f88d 1. Some optimization when conversion is not needed. 
2. One now must pass length argument into append(const char *str, uint length),
length is not calculated internally anymore.
 2004-05-25 15:54:03 +05:00
magnus@neptunus.(none)
2bee88a4c2 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-25 12:25:22 +02:00
magnus@neptunus.(none)
4ac5d3bdc1 Uses table_type() function to get name of storage engine before printing engine specific error message. 2004-05-25 12:10:54 +02:00
hf@deer.(none)
f200b0fbf0 WL#1562 (Improving spatial code) 
A set of changes improving our RTree indexes and fixed few bugs
found during the tests
 2004-05-25 15:06:32 +05:00
sergefp@mysql.com
d7dd97089e Manually merged, requirees more merging 2004-05-25 08:15:50 +04:00
monty@mysql.com
af44187bff Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
monty@mysql.com
0babddff40 New MYSQL_SERVER_SUFFIX usage (for easier compilation) 
Update of VC++ project files.
 2004-05-25 02:28:44 +03:00
dlenev@brandersnatch.localdomain
f23af5e6a2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-macosx
 2004-05-25 02:31:15 +04:00
dlenev@brandersnatch.localdomain
a5fab72bc4 Fix for sporadically failures of innodb.test on Darwin 7.3 
which occured because we were not lowering case of file names 
for temporary tables altough handler assumes so if 
lower_case_table_names==2. Now we are lowering case for them.
 2004-05-25 02:30:09 +04:00
konstantin@mysql.com
f207b33a7b Support for character set conversion in binary protocol: another go 
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
  connection on the fly, because they first should be written to the binary
  log.
  To support efficient conversion we need to rewrite prepared statements
  binlogging code first.
 2004-05-25 02:03:49 +04:00
sergefp@mysql.com
ef260fa754 Merge 2004-05-24 21:13:38 +04:00
sergefp@mysql.com
700adb9ae9 Added support for PREPARE stmt1 FROM @var, 
Fixed the problem of previous patch with replication,
More post-review fixes
 2004-05-24 21:08:22 +04:00
guilhem@mysql.com
50a2d97102 Fix for BUG#3871: a slave must always replicate a statement, even if it examines more than 4G rows, 
so we set SQL_BIG_SELECTS to 1.
 2004-05-24 18:46:49 +02:00
vva@eagle.mysql.r18.ru
1b61cb6d0f Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/TASK_ALTER_INFO/mysql-4.1
 2004-05-24 21:01:35 +05:00
vva@eagle.mysql.r18.ru
e2488c0378 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/TASK_ALTER_INFO/mysql-4.1
 2004-05-24 20:58:57 +05:00
monty@mysql.com
1acbfeafc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-24 15:59:22 +03:00
monty@mysql.com
eca917b79c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-24 15:00:12 +03:00
dlenev@brandersnatch.localdomain
b6d976e419 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-macosx
 2004-05-24 15:48:53 +04:00
dlenev@brandersnatch.localdomain
0e6217e999 Fix for bug which caused temp_table.test fail on Darwin 7.3 
The code in mysql_create_table() code assumes that if lower_case_names==2 then table alias 
should contain unchanged table name, and this was not true for temporary tables which
had 'tmp-table' constant as alias. Now we are using table name as alias for such tables.
 2004-05-24 15:48:19 +04:00
monty@mysql.com
56c0258536 After merge fixes 
Remove compiler warnings
Update windows project files
 2004-05-24 14:42:34 +03:00
magnus@neptunus.(none)
15023e1b8f Fixed prototype of get_error_message to use String to return error message 
WL#1747 and #1746 allow user to decide if ordered index should be created or not
 2004-05-24 12:35:39 +02:00
hf@deer.(none)
7afbe31db4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.3691
 2004-05-24 14:49:47 +05:00
hf@deer.(none)
098d8dd01f Fix for bug #3691 (libmysqld reports error 2 on CREATE DATABASE 
but database is created)
handling of CREATE DATABASE errors changed
 2004-05-24 12:23:52 +05:00
serg@serg.mylan
5b4f809706 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-05-23 14:11:10 +02:00
dlenev@brandersnatch.localdomain
c095ce828e Fix for bug which caused grant.test fail on darwin7.3. We were converting db and table 
names to lower case using latin1 instead of utf-8 in sql_acl.cc if lower_case_table_names 
was on. Also replaced in other such places system_charset_info with files_charset_info
for consistency.
 2004-05-22 23:41:58 +04:00
brian@brian-akers-computer.local
fe83735a26 Merge 2004-05-22 12:18:06 -07:00
brian@brian-akers-computer.local
9c84b9b691 Archive merge 2004-05-22 12:16:49 -07:00
brian@brian-akers-computer.local
00bd872d41 Resolving merge issues between archive and most recent changes by Monty/NDB 2004-05-21 10:06:49 -07:00
vva@eagle.mysql.r18.ru
7e93d385d4 Introduced parameter object "ALTER_INFO" for mysql_alter_table 
to make list of parameters in mysql_alter_table shorted
to avoid warning in MSVC (windows) building
 2004-05-21 19:57:03 +05:00
serg@serg.mylan
e21e41fce8 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-05-21 13:29:50 +02:00
serg@serg.mylan
11128fb672 asserting table->file->enable_indexes() in union re-execution 2004-05-21 09:31:28 +02:00
brian@avenger.(none)
467cad0bfc First commit of archive example. Archive is a simple storage engine that handles inserts and selects. 2004-05-20 18:13:11 -07:00
sergefp@mysql.com
f75b1adece Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-05-21 04:31:07 +04:00
sergefp@mysql.com
fb17025b3e WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2) 2004-05-21 04:27:50 +04:00
bell@sanja.is.com.ua
329ac02441 assigning max_length parameter for Item_param (Bug #3811) 2004-05-20 19:08:34 +03:00