1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-09 11:41:36 +03:00
Commit Graph

9785 Commits

Author SHA1 Message Date
ingo@mysql.com
65a4e27633 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 08:59:55 +01:00
msvensson@neptunus.(none)
47257f1317 Bug#16795 ndb_cache_multi2
- remove timing dependent part of test, wait until condition occurs or sleep max 10 seconds
2006-02-15 22:46:16 +01:00
msvensson@neptunus.(none)
cac0931b8c Add possibility to have a negative expression in "if" and "while" in mysqltest 2006-02-15 22:43:42 +01:00
evgen@moonbone.local
4d2b0fd026 Fix bug #15706 find_field_in_tables() returns field from outer select
If item->cached_table is set, find_field_in_tables() returns found field
even if it doesn't belong to current select. Because Item_field::fix_fields
doesn't expect such behaviour, reported bug occurs.

Item_field::fix_fields() was modifed to detect when find_field_in_tables() 
can return field from outer select and process such fields accordingly.
In order to ease this code which was searching and processing outed fields was
moved into separate function called Item_field::fix_outer_field().
2006-02-15 19:45:06 +03:00
pem@mysql.com
f5035faf51 Additional tests for nested handlers added to sp.test.
A follow-up to BUG#15011 (already fixed).
2006-02-15 17:28:34 +01:00
msvensson@devsrv-b.mysql.com
fa1f8a9c80 Bug#17261 Passing a variable from a stored procedure to UDF crashes mysqld
- Pass "buffers[i]" to val_str() in udf_handler::fix_fields insteead of NULL.
 - Add testcase for UDF that will load and run the udf_example functions 
   if available
2006-02-15 17:11:24 +01:00
pem@mysql.com
cfba31dd46 Fixed BUG#16887: Cursor causes server segfault
The problem was a code generation bug: cpop instructions were not generated
  when using ITERATE back to an outer block from a context with a declared
  cursor; this would make it push a new cursor without popping in-between,
  eventually overrunning the cursor stack with a crash as the result.
  Fixed the calculation of how many cursors to pop (in sp_pcontext.cc:
  diff_cursors()), and also corrected diff_cursors() and diff_handlers()
  to when doing a "leave"; don't include the last context we're leaving
  (we are then jumping to the appropriate pop instructions).
2006-02-15 12:11:29 +01:00
msvensson@neptunus.(none)
56ef2e28e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 12:02:20 +01:00
msvensson@neptunus.(none)
aacf783e86 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 10:53:25 +01:00
aelkin@mysql.com
42cc473df3 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-14 20:19:00 +02:00
aelkin@mysql.com
6423fe2d49 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-14 20:15:17 +02:00
evgen@moonbone.local
131217eb6f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/16272-bug-5.0-mysql
2006-02-14 19:46:35 +03:00
msvensson@neptunus.(none)
9a06392b2f Merge neptunus.(none):/home/msvensson/mysql/bug17233/my50-bug17233
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-14 17:25:44 +01:00
msvensson@neptunus.(none)
dc5bb00467 Enable ndb_load test case 2006-02-14 17:21:18 +01:00
msvensson@neptunus.(none)
52183ddd78 Change from std_data to std_data_ln 2006-02-14 17:15:24 +01:00
msvensson@neptunus.(none)
fed5a68ea8 Merge neptunus.(none):/home/msvensson/mysql/bug17280/my50-bug17280
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-14 15:34:30 +01:00
evgen@moonbone.local
8f904e9cab Fixed bug#16272: IF function with decimal args can produce wrong result
The Item_func_if::fix_length_and_dec() function when calculating length of 
result doesn't take into account unsigned_flag. But it is taken when 
calculating length of temporary field. This result in creating field that 
shorter than needed. Due to this, in the reported query 40.0 converted to 9.99.

The function Item_func_if::fix_length_and_dec() now adds 1 to the max_length if 
the unsigned_flag isn't set.
2006-02-14 16:22:37 +03:00
aelkin@mysql.com
5bd5967bdb Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-14 12:44:26 +02:00
aelkin@mysql.com
4f85993945 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-14 12:42:27 +02:00
bar@mysql.com
cc3623aecf Many files:
Backporting character_set_filesystem from 5.0 to 5.1.
2006-02-14 08:24:01 +04:00
igor@rurik.mysql.com
de6eedd756 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-13 18:56:42 -08:00
igor@rurik.mysql.com
75b6930d54 Fixed bug #16603.
A subquery transformation changes the HAVING clause of the embedding query if the subquery contains
a GROUP BY clause. Yet the split_sum_func2 function was not applied to the modified HAVING clause.
This could result in wrong answers.
2006-02-13 18:50:06 -08:00
petr@mysql.com
f20955af40 fix Bug#12813 "Instance Manager: START/STOP INSTANCE
commands accept a list as argument"
2006-02-14 03:09:17 +03:00
aelkin@mysql.com
e7a0822a47 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
2006-02-13 19:17:02 +02:00
aelkin@mysql.com
0866e4267a Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
2006-02-13 19:15:02 +02:00
aelkin@mysql.com
312f68133c Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-13 19:13:33 +02:00
SergeyV@selena.
da94b1662b Fixes bug #15943. resets error flag for show create view command, to allow
proper processing of multiple sql statements sent as a single command.
2006-02-13 19:53:34 +03:00
pem@mysql.com
d67b0a6bf6 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug16896/mysql-5.0
2006-02-13 15:54:03 +01:00
pem@mysql.com
292ec72185 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug16896/mysql-5.0
2006-02-13 13:02:35 +01:00
kent@mysql.com
f9a23667b2 Merge 2006-02-12 04:33:50 +01:00
kent@mysql.com
30b8a9c1fb spatial.cc:
Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"
mtr_report.pl:
  Parse error logs to create "warnings" file
mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test-run.pl, mtr_process.pl:
  Back port of changes from 5.0
2006-02-12 04:13:24 +01:00
knielsen@mysql.com
9025342992 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/usr/local/mysql/mysql-4.1-fixrace
2006-02-12 00:19:59 +01:00
knielsen@mysql.com
5346bf7392 Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-02-12 00:10:43 +01:00
kent@mysql.com
c94b3638f1 Merge 2006-02-11 23:44:56 +01:00
kent@mysql.com
2619c54bd1 mysql-test-run.{pl,sh}:
Give space for second and third slave port
2006-02-11 23:35:23 +01:00
knielsen@mysql.com
43189fd8ad Fix a race on some platforms in mysql-test-run.pl, where it would sometimes
errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.
2006-02-11 22:50:59 +01:00
sergefp@mysql.com
f95b5b0a5d BUG#17314: Can't use index_merge/intersection for MERGE tables
1. Fix index access costs for MERGE tables, set block_size=myisam_block_size/#underlying_tables 
   instead of 0 which it was before.
2. Make index scans on MERGE table to return records in (key_tuple, merge_table_rowid) order, 
   instead of just (key_tuple) order. This makes an index scan on MERGE table to be truly a ROR-scan
   which is a requirement for index_merge union/intersection.
2006-02-11 21:51:43 +03:00
kent@mysql.com
5fe2e8fd7d mysql-test-run.pl:
Display instance manager port
mysql-test-run.sh:
  Give port space for more than one slave
2006-02-10 19:56:34 +01:00
kent@mysql.com
f8e08f38fe Merge 2006-02-10 19:47:46 +01:00
kent@mysql.com
d23d02be18 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-02-10 19:18:45 +01:00
tomas@poseidon.ndb.mysql.com
9663f6cbee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-10 18:16:34 +01:00
tomas@poseidon.ndb.mysql.com
cbac75de91 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2006-02-10 17:53:13 +01:00
tomas@poseidon.ndb.mysql.com
27a14f93eb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-10 17:50:17 +01:00
tomas@poseidon.ndb.mysql.com
7050a7586e Bug #17249 ndb, delete statement with join where clause fails when table do not have pk
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
2006-02-10 17:40:22 +01:00
aelkin@mysql.com
14ced05e55 BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part.
This changeset is assumed to stay in 4.1.
2006-02-10 15:12:27 +02:00
msvensson@neptunus.(none)
4217699e56 Bug#17280 mysqltest, --echo sometimes does not expand $variables
- Evaluate all variables in the text before printing it to result file
2006-02-10 12:11:16 +01:00
petr@mysql.com
f037d4772e Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/devel/5.0-mike
2006-02-10 10:56:27 +03:00
petr@mysql.com
1c7bc08537 a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
ramil@mysql.com
e1dabf65e4 Merge mysql.com:/usr/home/ram/work/4.1.heap
into  mysql.com:/usr/home/ram/work/mysql-5.0
2006-02-09 18:23:37 +04:00
aelkin@mysql.com
dd2a44c497 BUG#16217 forced to introduce a separate mysql client command to adopt its
internal charset to one associated with currently being handled query. 
To note such a query can come from interactive client either.

There was a discussion within replication team and Monty who's suggestion won.
It avoids straightforward parsing of all `set' queries that could affect client side 
character set. 
According to the idea, mysql client does not parse `set' queries but rather cares of
`charset new_cs_name' command.
This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
so that enlightened clients like `mysql' knows what to do with it.

Interactive human can switch between many multi-byte charsets during the session 
providing the command explicitly. 
To note that setting new internal mysql's charset does not
trigger sending any `SET' sql statement to the server.
2006-02-09 16:23:09 +02:00