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
27336 commits 2784 branches 343 tags 1.6 GiB
Commit graph

13022 commits

Author SHA1 Message Date
evgen@moonbone.local
38a470794d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13327-bug-5.0-mysql
 2005-10-12 00:12:54 +04:00
lars@mysql.com
7a94010da9 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-10-11 21:46:40 +02:00
evgen@moonbone.local
50361f8b00 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13327-bug-5.0-mysql
 2005-10-11 23:31:32 +04:00
hf@deer.(none)
40bd22ef69 Fix for bug #13667 (Inconsistency for decimal(m,d) specification. 2005-10-11 21:18:04 +05:00
eric@mysql.com
6c80672c8a Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/eric/dev/mysql-5.0
 2005-10-11 09:13:27 -07:00
jimw@mysql.com
c8a6c2c614 Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how 
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731)
 2005-10-11 09:12:12 -07:00
jimw@mysql.com
de8b29cd0e Merge mysql.com:/home/jimw/my/mysql-5.0-13650 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-11 08:40:23 -07:00
pem@mysql.com
9d16659d10 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/bug7049/mysql-5.0
 2005-10-11 15:57:27 +02:00
pem@mysql.com
2456c0c668 Fixed BUG#13510: Setting password local variable changes current password 
Disallow conflicting use of variables named "password" and "names". If such
  a variable is declared, and "SET ... = ..." is used for them, an error is
  returned; the user must resolve the conflict by either using `var` (indicating
  that the local variable is set) or by renaming the variable.
  This is necessary since setting "password" and "names" are treated as special
  cases by the parser.
 2005-10-11 15:01:38 +02:00
guilhem@mysql.com
554970c058 To help people avoid BUG#2122 "changing hostname confuses master or slave" until it's fixed, 
we now issue a warning (at slave's server startup only) when a relay log is named
using the implicit hostname-relay-bin naming. Like we already do for binlogs.
 2005-10-11 15:01:24 +02:00
gluh@eagle.intranet.mysql.r18.ru
8d01ea1be7 Fix for bug#9270 multiple SSL race conditions (for 5.0 tree) 
The fix is needed to perform locking on shared data structures
  This is modification of patch proposed by Leandro Santi
  (see http://webs.sinectis.com.ar/lesanti/misc/mysql-4.0.23a-openssl_locking.patch)
 2005-10-11 16:26:00 +05:00
hf@deer.(none)
be0917049b Merging 2005-10-11 14:58:25 +05:00
jimw@mysql.com
083c032ec3 Fix minimum value of query_prealloc_size to be the same as its default. (Bug #13334) 2005-10-10 19:39:16 -07:00
eric@mysql.com
215ecd3322 BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLE 2005-10-10 17:41:36 -07:00
lars@mysql.com
bef189cc4e Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0
 2005-10-10 21:52:50 +02:00
lars@mysql.com
5456afc603 Added missing HAVE_REPLICATION define 2005-10-10 21:42:14 +02:00
svoj@mysql.com
3d0082d3b0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/engine/mysql-5.0
 2005-10-11 00:35:09 +05:00
svoj@mysql.com
83043c3c83 Always save/restore connect string. 2005-10-10 23:53:53 +05:00
svoj@mysql.com
eb8ab30046 Store and read engine type string in extra block of .frm. 2005-10-10 23:01:45 +05:00
lars@mysql.com
af951aa662 After merge fixes 2005-10-10 19:38:58 +02:00
lars@mysql.com
cd0e0a9933 Added missing HAVE_REPLICATION define 2005-10-10 19:23:13 +02:00
hf@deer.(none)
83c103ed81 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.13372
 2005-10-10 21:09:34 +05:00
lars@mysql.com
57f36732ca Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-5.0
 2005-10-10 17:50:19 +02:00
evgen@moonbone.local
65325ecbbb Fix bug#13327 check_equality() wasn't checking view's fields 
check_equality() finds equalities among field items. It checks input items
to be Item_fields thus skipping view's fields, which are represented by
Item_direct_view_ref. Because of this index wasn't applied in all cases
it can be.

To fix this problem check_equality() now takes real item of
Item_direct_view_ref, except outer view refs (with depended_from set).
 2005-10-10 18:53:57 +04:00
lars@mysql.com
998380521f BUG#12618: Removing fake locking 2005-10-10 15:10:14 +02:00
evgen@moonbone.local
1b15a2d482 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into moonbone.local:/work/7672-bug-4.0-mysql
 2005-10-09 23:12:12 +04:00
evgen@moonbone.local
6bfc2d4b89 Fix bug#7672 Unknown column error in order clause 
When fixing Item_func_plus in ORDER BY clause field c is searched in all
opened tables, but because c is an alias it wasn't found there.

This patch adds a flag to select_lex which allows Item_field::fix_fields() 
to look up in select's item_list to find aliased fields.
 2005-10-09 23:05:44 +04:00
konstantin@mysql.com
2c7505b263 Remove protocol_cursor.cpp (no longer used) from sources 
Fix a compile failure
 2005-10-09 14:45:08 +04:00
serg@serg.mylan
ba169f81e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-08 16:59:41 +02:00
serg@serg.mylan
da625424e0 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-10-08 16:59:08 +02:00
serg@serg.mylan
510d5c3583 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-08 16:56:10 +02:00
serg@serg.mylan
e91712d9bb pthread_handler_decl() changed to be ctags-friendly 
(and contain extern "C" when necessary)
 2005-10-08 16:39:55 +02:00
serg@serg.mylan
ae293f9ac5 Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE" 
don't allow STOP SLAVE if global read lock is in taken
 2005-10-08 14:46:04 +02:00
monty@mysql.com
17d7ba931d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-08 03:37:23 +03:00
monty@mysql.com
f577ebb88f Simple changes during review of code 
Added back flag that I accidently removed in last patch
 2005-10-08 00:57:40 +03:00
gluh@eagle.intranet.mysql.r18.ru
b2b8d8b276 Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails 
allow select into outfile from I_S tables
  it is enough to add FILE_ACL for I_S tables only to 'check_table_access' function
  as we use 'any_db' for 'check_access' function in places where FILE_ACL is required
 2005-10-07 14:16:44 +05:00
sergefp@mysql.com
140dea1426 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13484
 2005-10-07 11:14:40 +04:00
bar@mysql.com
62ad8922b8 ctype_utf8.result, ctype_utf8.test: 
Adding test case.
item_func.cc:
  Bug#13751 find_in_set: Illegal mix of collations.
  Character set conversion was forgotten in find_in_set.
 2005-10-07 09:52:15 +05:00
monty@mysql.com
3f73d25fba Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2005-10-07 04:02:53 +03:00
jimw@mysql.com
4a893c96e3 Fix use of "%*s" *printf() specifiers that were really meant to be 
"%.*s". (Bug #13650)
 2005-10-06 17:37:24 -07:00
monty@mysql.com
82855517a1 Review of new code since last pull 
- Use %lx instead of %p as %p is not portable
- Don't replace ROW item with Item_null
 2005-10-07 03:12:15 +03:00
jimw@mysql.com
77fbc72f47 Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619) 2005-10-06 16:15:53 -07:00
serg@serg.mylan
b05a6d8fda don't "init" binlog if opt_bin_log is not set 
(bug#13791 - mysqld crashes at startup in TC_LOG_MMAP::open)
 2005-10-06 19:05:34 +02:00
monty@mysql.com
78e828d32f Review of code pushed since last 5.0 pull: 
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
 2005-10-06 17:54:43 +03:00
kent@mysql.com
5e204d46f1 Merge 2005-10-06 15:42:50 +02:00
msvensson@msdesk.(none)
5da6a6c8a1 Merge msdesk.(none):/home/msvensson/mysql-4.1 
into  msdesk.(none):/home/msvensson/mysql-5.0
 2005-10-06 14:40:18 +02:00
bar@mysql.com
905c8b8c88 item_cmpfunc.cc: 
Wrong variable.
 2005-10-06 15:26:59 +05:00
kent@mysql.com
3af12c4776 my_pthread.h: 
Let pthread_mutex_init() macro return 0 on Windows
mysql_priv.h:
  Return type is to be 'my_bool' for 'opt_enable_shared_memory'
 2005-10-06 03:49:14 +02:00
serg@serg.mylan
2356401750 Bug#12935 Local and XA transactions not mutually exclusive 2005-10-05 19:58:16 +02:00
serg@serg.mylan
faa0365d29 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-05 19:37:02 +02:00
serg@mysql.com
83683bb649 sql_table.cc: 
fixed CHECKSUM TABLE to be independent from the first 'deleted' bit in the null bitmask (undefined in the InnoDB)
  bug#13710
 2005-10-05 19:36:20 +02:00
pem@mysql.com
5640d19432 Fixed BUG#13616: "CALL <dbname>.<procedurename>" executes properly, but 
displays error
    When returning to the old database (which may be ""), don't do
    access check - mysql_change_db() would then generate the error
    "No database selected".
    Note: No test case added; it seems a db is always selected when running
    tests.
 2005-10-05 16:39:37 +02:00
serg@serg.mylan
10953a6d8c Bug#13143 - formatID should not affect XID's uniqueness 2005-10-05 16:38:53 +02:00
bar@mysql.com
1fb8ea3714 item_cmpfunc.cc: 
wrong variable.
 2005-10-05 17:33:39 +05:00
bar@mysql.com
a98e6dfe44 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
 2005-10-05 11:28:08 +05:00
serg@serg.mylan
3edd6c016a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-04 21:43:56 +02:00
jani@ua141d10.elisa.omakaista.fi
a1b609f010 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-10-04 19:53:07 +03:00
jani@ua141d10.elisa.omakaista.fi
4099872e2c Fixed several boolean type options used in my_long_options[]. 
Some options were declared as 'bool', but since those are being
handled in my_getopt.c, bool can be machine dependent. To make
sure it works in all circumstances, the type should be my_bool
for C (not C++) programs.
 2005-10-04 19:52:12 +03:00
serg@serg.mylan
84859c3895 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-04 18:10:38 +02:00
jani@ua141d10.elisa.omakaista.fi
17e87da298 Some fixes including implicit declaration of a function, 
using wrong type in assignment etc.
 2005-10-04 18:20:57 +03:00
serg@mysql.com
062f145bf8 sql_table.cc, table.cc, table.h: 
fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
  bug#13710
 2005-10-04 17:04:20 +02:00
brian@zim.(none)
11be8401a7 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/fix-5.0
 2005-10-03 21:09:01 -07:00
kent@mysql.com
fe26e59d70 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-04 04:03:48 +02:00
brian@zim.(none)
2a42afd132 Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers. 
May changes were to simplify storage engine setup and support for legacy call to show storage engines.
 2005-10-03 18:42:30 -07:00
evgen@moonbone.local
5a10244d8b Fix bug#13535 Incorrect result from SELECT statement after SHOW TABLE STATUS 
After SHOW TABLE STATUS last_insert_id wasn't cleaned, and next select
erroneously rewrites WHERE condition and returs a row;
5.0 isn't affected because of different SHOW TABLE STATUS handling.

last_insert_id cleanup added to mysqld_extend_show_tables().
 2005-10-03 23:22:46 +04:00
timour@mysql.com
233e68e205 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-13410
 2005-10-03 22:02:22 +03:00
SergeyV@selena.
7d0d7826bb Fixes bug #13377. Added code to close active log files in case 
of log reset condition.
 2005-10-03 20:34:42 +04:00
marko@hundin.mysql.fi
bf30733840 Merge hundin.mysql.fi:/home/marko/mysql-4.0 
into  hundin.mysql.fi:/home/marko/mysql-4.1
(Bug #13002)
 2005-10-03 17:54:39 +03:00
marko@hundin.mysql.fi
d62b9f4b4b InnoDB: Display an error message in /* */ comments 
in SHOW CREATE TABLE if a temporary file cannot be created.
(Bug #13002)
 2005-10-03 17:46:27 +03:00
kent@mysql.com
f49ac24a0f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-03 10:39:35 +02:00
msvensson@neptunus.(none)
25cf17f695 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
 2005-10-03 10:08:02 +02:00
brian@zim.(none)
0ba8ca2a17 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/fix-5.0
 2005-10-02 20:13:18 -07:00
brian@zim.(none)
54a958993c Next big patch for loadable storage engines! 
Handlerton array is now created instead of using sys_table_types_st. All storage engines can now have inits and giant ifdef's are now gone for startup. No compeltely clean yet, handlertons will next be merged with sys_table_types. Federated and archive now have real cleanup if their inits fail.
 2005-10-02 19:44:28 -07:00
sergefp@mysql.com
90414dcaaf BUG#13484: In ha_innobase::cmp_ref call Field::key_cmp() as this is the function 
that compares key images.
 2005-10-01 11:56:01 +04:00
timour@mysql.com
77cf84186e Fix for BUG#13410 - qualified reference to a view column in the HAVING clause cannot be resolved. 
The problem was then when a column reference was resolved to a view column, the new Item
created for this column contained the name of the view, and not the view alias.
 2005-10-01 09:35:30 +03:00
eric@mysql.com
b2f5281929 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/eric/dev/hton-mysql-5.0
 2005-09-30 16:28:47 -07:00
eric@mysql.com
5008a5f208 Move handler specific options into handlerton flag check 
BUG#13108
 2005-09-30 16:26:48 -07:00
kent@mysql.com
aef1f4cd2e Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-09-30 22:37:55 +02:00
serg@mysql.com
78001860a6 Merge 2005-09-30 20:30:09 +02:00
serg@serg.mylan
bef3c587c6 Bug#11238 
"SELECT ... FOR UPDATE executed as consistent read inside LOCK TABLES"
Do not discard lock_type information as handler::start_stmt() may require knowledge.
(fixed by Antony)
 2005-09-30 20:20:10 +02:00
dlenev@mysql.com
09370d6527 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13629 
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-09-30 21:45:20 +04:00
msvensson@neptunus.(none)
92b1d080c9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
 2005-09-30 16:51:35 +02:00
timour@mysql.com
1740f72305 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-13597
 2005-09-30 17:01:55 +03:00
dlenev@mysql.com
e0cfaeaaf6 Fix for bug #13629 "view test crashes for debug build" (also includes better 
fix for bug #13451 "view test produces warning about unfreed memory").
 2005-09-30 17:30:33 +04:00
marko@hundin.mysql.fi
17b0098127 InnoDB: After review fix 2005-09-30 15:06:41 +03:00
kent@mysql.com
21cf818a8d Many files: 
New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
 2005-09-30 14:03:55 +02:00
sergefp@mysql.com
e9f2f9437a BUG#12915: Added single-table UPDATE/DELTE ... ORDER BY ... LIMIT 
optimization: now can use index to find records to update/delete
when there is no WHERE clause.
 2005-09-30 15:21:37 +04:00
marko@hundin.mysql.fi
8c1ccbc903 InnoDB: On UPDATE, trim UCS2 columns correctly. (Bug #12178) 2005-09-30 13:58:00 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
26b3ef7f44 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
 2005-09-30 13:56:32 +03:00
sergefp@mysql.com
49954f6735 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-sept30-test
 2005-09-30 14:21:10 +04:00
sergefp@mysql.com
3625ec5127 BUG#13081: Disable ROR-index_merge for NDB tables (by adding a 
HA_KEY_SCAN_NOT_ROR index flag) as NDB index scans are not guaranteed to be ROR 
scans.
 2005-09-30 14:20:15 +04:00
serg@serg.mylan
fff2737b0e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-30 12:04:10 +02:00
serg@serg.mylan
8c813c0a16 duplicate error message removed 2005-09-30 12:01:39 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
43b544a968 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
 2005-09-30 12:36:23 +03:00
serg@serg.mylan
69909c460a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-30 09:40:49 +02:00
timour@mysql.com
638198e17d Fix for BUG#13597 - columns in ON condition not resolved if references a table in a nested right join. 
The problem was in that when finding the last table reference in a nested join tree,
the procedure doing the iteration over the right-most branches of a join tree
was testing for RIGHT JOINs the table reference that represents the join, and not
the second operand of the JOIN. Currently the information whether a join is LEFT/RIGHT
is stored not on the join object itself, but on one of its operands.
 2005-09-30 10:39:17 +03:00
ramil@mysql.com
4dbe76d035 Comment adjusted (see fix for #13545) 2005-09-30 12:37:58 +05:00
ramil@mysql.com
63fa48c0f6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2005-09-30 12:30:32 +05:00
lars@mysql.com
bf19d02b27 mysqlbinlog --hexdump additional patch 2 
- Fixes related to Guilhems review
- Special printing of event header
 2005-09-30 00:12:14 +02:00
sergefp@mysql.com
7d383eecb5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13455
 2005-09-30 01:38:04 +04:00
sergefp@mysql.com
71d8990f8e Fix for BUG#13455: Make "ref" optimizer able to make this inference: 
"t.key BETWEEN c1 AND c2" and c1 = c2 -> can access table t using "t.key = c1".
 2005-09-30 01:34:19 +04:00
pem@mysql.com
9ca73fac4a Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-09-29 16:59:25 +02:00
pem@mysql.com
44b4e9fc82 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 16:41:46 +02:00
ramil@mysql.com
920e456549 fix for bug #13545: Server crash caused by select query. 2005-09-29 19:34:21 +05:00
georg@lmy002.wdf.sap.corp
e445a3d8e3 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0
 2005-09-29 16:15:00 +02:00
pem@mysql.com
f78ea0265d Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-09-29 15:06:08 +02:00
pem@mysql.com
9f20feea5b Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 14:35:08 +02:00
gluh@mysql.com
b36f63e3ab 4.1 -> 5.0 merge 2005-09-29 16:35:50 +05:00
gluh@eagle.intranet.mysql.r18.ru
f9762c47d0 Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment 
"CHARACTER SET", "COLLATE", and "DEFAULT" are always
  printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
  "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only 
  if NO_FIELD_OPTIONS is not set.
 2005-09-29 16:17:45 +05:00
bar@mysql.com
7fe434098e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
 2005-09-29 16:07:33 +05:00
lars@mysql.com
835a24cb13 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-09-29 12:34:03 +02:00
georg@lmy002.wdf.sap.corp
2e05b3b125 Fix for bug #13451 (memleak in rename view) after Dmitri's review: 
- call explicitly destructor for view's LEX
- cs fixes
 2005-09-29 12:29:58 +02:00
jan@hundin.mysql.fi
43b2dc617b Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/mysql-5.0
 2005-09-29 13:15:09 +03:00
pem@mysql.com
66fa4ffbdf Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 11:37:28 +02:00
marko@hundin.mysql.fi
d426c109f4 Minor corrections to InnoDB function comments 2005-09-29 12:37:27 +03:00
lars@mysql.com
d81d57d408 mysqlbinlog --hexdump augments each log entry with byte information 2005-09-29 10:42:23 +02:00
msvensson@neptunus.(none)
9b7a3bec70 Bug #13231 mysqltest: fails to dectect when mysql_next_result fails 
- Packets out of order when reading cached data stored by a normal select from a ps or vice versa.
 - Add pkt_nr to query cache flags
 2005-09-29 10:25:44 +02:00
jan@hundin.mysql.fi
6734ca6cbe Fixed a bug checksum table locks the InnoDB table and does not use a 
consistent read (Bug #12669). This fixes InnoDB part of the bug.
 2005-09-29 08:34:38 +03:00
brian@zim.(none)
db486f4da1 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/archive-move
 2005-09-28 19:07:43 -07:00
brian@zim.(none)
da101b3b5a Moving archive from example to sql. 2005-09-28 19:04:51 -07:00
kent@mysql.com
656b0cc15a Merge 2005-09-29 03:20:31 +02:00
kent@mysql.com
844d964f2d Many files: 
Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
my_regex.h:
  Rename: regex/regex.h -> regex/my_regex.h
 2005-09-29 02:08:24 +02:00
evgen@moonbone.local
1bf2fbdb35 select.result, item.cc: 
After merge fix for bug#13356
 2005-09-28 21:30:10 +04:00
msvensson@neptunus.(none)
8ccd9e37ad Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 18:23:23 +02:00
dlenev@mysql.com
6f7928c293 Fix for bug #13546 "Build errors with --with-embedded-server 
--with-embedded-privilege-control options". One more (hopefully last) build
failure which was introduced during work on WL#2787 "Add view definer/owner
to the view definition..."
 2005-09-28 18:43:46 +04:00
msvensson@neptunus.(none)
13161c2a84 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 15:32:05 +02:00
msvensson@neptunus.(none)
60e5493d5d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 13:30:33 +02:00
osku@127.(none)
d440270dcd InnoDB: Remove compiler warnings. 2005-09-28 14:26:33 +03:00
jan@hundin.mysql.fi
dc80450410 Fixed a bug checksum table locks the InnoDB table and does not use a 
consistent read (Bug #12669).
 2005-09-28 14:14:49 +03:00
msvensson@neptunus.(none)
fbf4a5e079 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 11:34:53 +02:00
bar@mysql.com
6e88f14eea Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
 2005-09-28 11:51:03 +05:00
evgen@moonbone.local
4f4711bd49 Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items. 
resolve_const_item() assumed to be not called for Item_row items. For
ensuring that DBUG_ASSERT(0) was set there.

This patch adds section for Item_row items. If it can it recursively calls
resolve_const_item() for each item the Item_row contains. If any of the
contained items is null then whole Item_row substitued by Item_null. Otherwise
it just returns.
 2005-09-28 00:58:12 +04:00
serg@serg.mylan
6716d16bc7 CHECKSUM TABLE now allows concurrent inserts 2005-09-27 20:11:09 +02:00
pem@mysql.com
2f3682db7e Fixed BUG#12589: Assert when creating temp. table from decimal stored 
procedure variable
  Second version, after review.
  Keep the unsigned_flag in Item_decimal updated. Note that this also changed
  the result of several old test results - creating tables from decimal
  templates now gives unsigned columns and different sizes. (Several tests
  had Length > Max_length before.)
 2005-09-27 17:07:28 +02:00
hf@deer.(none)
9b88d25247 additional fix to the bug #13372 (decimal union) 2005-09-27 15:31:38 +05:00
hf@deer.(none)
7f3e2dc48d Fix for bug #13372 (decimal union) 2005-09-27 15:11:39 +05:00
igor@rurik.mysql.com
6e2fb27af6 item.cc: 
Fixed bug #13410.
  Fixed name resolution for qualified reference to a view column
  in the HAVING clause.
view.result, view.test:
  Added a test case for bug #13410.
 2005-09-26 23:29:02 -07:00
igor@rurik.mysql.com
75c43f9663 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-09-26 20:28:49 -07:00
igor@rurik.mysql.com
a43b341c8a sql_base.cc, item.cc: 
Fixed bug #13411.
  Fixed name resolution for non-qualified reference to a view column
  in the HAVING clause.
view.result, view.test:
  Added a test case for bug #13411.
 2005-09-26 20:18:59 -07:00
pem@mysql.com
6a84506af7 Fixed BUG#7049: Stored procedure CALL errors are ignored 
Search the chain of sp_rcontexts recursively for handlers. If one is found,
  it will be detected in the sp_head::execute() method at the corresponding
  level.
 2005-09-26 18:46:31 +02:00
pem@mysql.com
6ac4c47f7b Fixed BUG#6127: Stored procedure handlers within handlers don't work 
Replaced the dumb in-handler/not-in-handler check with a proper recursion
    check of handlers being executed.
    (Re-commit in a different tree, to make push possible.)
 2005-09-26 18:22:00 +02:00
evgen@moonbone.local
0032165acf Fix bug #13424 locking view with query cache enabled crashes server 
For LOCK view is opened but not prepared thus leaving 'table' field set to
NULL. invalidate_locked_for_write() wasn't checking that and call to 
invalidate_table(NULL) crashes server.

To invalidate_locked_for_write() added check that ensures that table is
completely opened.
 2005-09-26 19:08:26 +04:00
lars@mysql.com
9528d0aefd Fixed gcc error on AMD64: cast from 'char*' to 'unsigned int' loses precision 2005-09-26 16:49:18 +02:00
hf@deer.(none)
836bc2638e Fix for bug #12267 (primary key over GEOMETRY field) 2005-09-26 14:55:52 +05:00
hf@deer.(none)
6890eae9e5 Merging 2005-09-26 13:15:01 +05:00
monty@mysql.com
ea6d5f9ec3 Fixed error found during review of new pushed code 2005-09-25 21:22:23 +03:00
serg@serg.mylan
4b24f83f8f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-25 16:07:13 +02:00
sergefp@mysql.com
2294c9b57a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13317
 2005-09-25 01:36:26 +04:00
serg@serg.mylan
e9d8f0940b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-24 21:45:30 +02:00
sergefp@mysql.com
061d660615 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-merge-sept24
 2005-09-24 03:33:26 +04:00
monty@mysql.com
6c6a25e9d7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2005-09-24 02:32:34 +03:00
sergefp@mysql.com
9a05a887de Manually merged 2005-09-24 02:39:52 +04:00
sergefp@mysql.com
d0a97917a2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug13419
 2005-09-24 01:55:09 +04:00
jimw@mysql.com
844d1244d7 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-23 14:44:41 -07:00
sergefp@mysql.com
d90b988da7 BUG#12232: Addressing docs team feedback: s/inequal/unequal/ 2005-09-24 01:39:50 +04:00
paul@kite-hub.kitebird.com
67a643f931 mysqld.cc: 
Fix out-of-order status variable.
 2005-09-23 15:59:32 -05:00
jimw@mysql.com
e80673d69d Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-23 13:59:14 -07:00
paul@kite-hub.kitebird.com
b83f29d56d mysqld.cc: 
Fix out-of-order status variable.
 2005-09-23 14:14:34 -05:00
jani@a193-229-222-105.elisa-laajakaista.fi
8d3036c35e Some minor fixes revealed as warnings by 
Intel compiler.
 2005-09-23 21:28:56 +03:00
dlenev@mysql.com
19b2cd58e8 Fix for yet another compilation failure on Windows which was introduced during 
work on WL#2787 "Add view definer/owner to the view definition (.frm) to check
privileges on used tables and stored routines when using a VIEW."
(aka bug #13402 "Windows VS 2003 Compiler error")
 2005-09-23 21:28:47 +04:00
jimw@mysql.com
3cd331c29f Merge mysql.com:/home/jimw/my/mysql-5.0-13361 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-23 10:03:29 -07:00
dlenev@mysql.com
d68f3ea17d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13407
 2005-09-23 18:30:08 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
acf218b708 Several fixes revelaled by Intel compiler. 2005-09-23 16:47:08 +03:00
osku@127.(none)
93671fb91e Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql/5.0/clean
 2005-09-23 16:46:59 +03:00
osku@127.(none)
d563a01afe Merge 127.(none):/home/osku/mysql/5.0/clean 
into  127.(none):/home/osku/mysql/5.0/3443
 2005-09-23 16:44:25 +03:00
osku@127.(none)
d61708d1c9 Fix bug #3443, better foreign key error messsages. 2005-09-23 16:22:27 +03:00
dlenev@mysql.com
77ac122350 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13407
 2005-09-23 17:10:05 +04:00
msvensson@neptunus.(none)
22c1bb4e6d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-23 14:38:26 +02:00
msvensson@neptunus.(none)
d55eeed8fd Merge from 4.1 to 5.0 2005-09-23 14:37:22 +02:00
serg@serg.mylan
d4eaa0ecc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-23 14:36:38 +02:00
osku@127.(none)
06077eb1eb InnoDB: Minor fixes. 2005-09-23 14:31:31 +03:00
sergefp@mysql.com
40ba88ca07 Fix for BUG#13419: In "ref" optimizer, take into account that item=Item_func_in(x,y) is 
not equivalent to "x=y" when item->negated == TRUE.
 2005-09-23 13:43:20 +04:00
osku@127.(none)
945ea8a98b Merge 127.(none):/home/osku/mysql/5.0/clean 
into  127.(none):/home/osku/mysql/5.0/13315
 2005-09-23 11:22:05 +03:00
osku@127.(none)
e6b3261556 InnoDB: Fix bug #13315, index columns having a maximum length of 767. 2005-09-23 11:20:34 +03:00
bar@mysql.com
1c38733f4a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
 2005-09-23 12:57:40 +05:00
msvensson@neptunus.(none)
02c7645cc1 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-23 09:18:56 +02:00
brian@zim.(none)
f5c00b0dbd Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/fix-5.0
 2005-09-22 19:46:16 -07:00
brian@zim.(none)
8eea3e5be0 This fixed bug 13369. Note, I dislike goto's as well. 
The alias structure now is a bit more simple and just uses a pointer to replace with the currect name. The giant case statement should go away in the next patch.
 2005-09-22 16:58:09 -07:00
jimw@mysql.com
3bfe3579d4 Fix CAST(1.0e+300 TO SIGNED). (Bug #13344) 2005-09-22 15:59:13 -07:00
konstantin@mysql.com
2d4c54ba1b Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-09-23 00:46:59 +04:00
dlenev@mysql.com
87dcb3c6f5 Fix for bug #13407 "Remote connecting crashes server" and couple of similar 
problems which were introduced during work on WL#2787 "Add view definer/owner
to the view definition (.frm) to check privileges on used tables and stored
routines when using a VIEW."

In some cases it is better to use value from Security_context::host_or_ip
instead of value from Security_context::host since the latter can be NULL
in certain situations (When we can't resolve hostname or we have not done
this yet).
 2005-09-22 23:03:53 +04:00
jimw@mysql.com
90d6195f04 Fix handling of NULL values in decimal fields in FORMAT(). (Bug #13361) 2005-09-22 11:40:22 -07:00
joerg@mysql.com
cb77a6accb Fixes needed to build 5.0.13 on Windows: 
- reflect two "Makefile.am" changes in the respective "VC project" files,
- correct a typo in a (normally) unused macro parameter.
 2005-09-22 18:57:07 +02:00
serg@serg.mylan
40c43365c5 fixed a memory leak in ha_tina.cc 2005-09-22 16:05:05 +02:00
marko@hundin.mysql.fi
ff8127ffaa InnoDB: correct two misleading comments 2005-09-22 13:09:14 +03:00
ramil@mysql.com
5cf4eb0e26 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b11553
 2005-09-22 13:05:48 +05:00
gluh@eagle.intranet.mysql.r18.ru
88ef33e542 Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting 
set auto_increment_field_not_null to true to preserve zero values
  for autoincrement fields during LOAD DATA execution if 
  NO_AUTO_VALUE_ON_ZERO sql mode is set
 2005-09-22 12:46:01 +05:00
ramil@mysql.com
92306dd089 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b11553
 2005-09-22 11:46:54 +05:00
ramil@mysql.com
66929c9540 a fix (#11553: gives error if aggregate user-defined function in HAVING clause). 2005-09-22 11:45:16 +05:00
ramil@mysql.com
d9eb8958a2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b11553
 2005-09-22 11:39:01 +05:00
monty@mysql.com
82fc54781b Fixed problems found by valgrind 
Fixed problems in test suite where some test failed
Fixed access to not initialized memory in federated
Fixed access to not initialized memory when using BIT fields in internal temporary tables
 2005-09-22 03:23:07 +03:00
evgen@moonbone.local
2ba1eb1486 Manual merge 2005-09-22 02:38:14 +04:00
konstantin@mysql.com
6f8d3c4844 A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 
cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server
Crash while fetching from table with 5 million records."
A fix for a possible memory leak when fetching into an SP cursor
in a long loop.
The patch uses a common implementation of cursors in the binary protocol and 
in stored procedures and implements materialized cursors.
For implementation details, see comments in sql_cursor.cc
 2005-09-22 02:11:21 +04:00
evgen@moonbone.local
5065d73ebb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/13180-bug-4.1-mysql
 2005-09-22 01:48:39 +04:00
evgen@moonbone.local
b7e8c8b112 Fix bug #13180 thd->allow_sum_funcs wasn't reset before query processing. 
thd->allow_sum_func was left 'true' after previous statement thus allowing
sum funcs to be present in conditions.

thd->allow_sum_func should be set to 0 for each query and each prepared
statement reinitialization. This is done in lex_start() and 
reset_stmt_for_execute().
 2005-09-22 01:38:39 +04:00
bar@mysql.com
d870612ac0 Bug#13046: LIKE pattern matching using prefix 
index doesn't return correct result
item_cmpfunc.cc:
  Use charset of LIKE to decide whether
  to use 8bit or Unicode "escape" value.
  But use charset of "escape" to scan escape character.
strings/ctype-xxx.c:
  We cannot reduce "end" pointer using charpos(),
  because of possible escape characters in the string.
  Limit the loop using count of written characters instead.
ctype_like_escape.inc:
  new file
mysql-test/t/ctype_xxx:
mysql-test/r/ctype_xxx:
  Adding test case.
 2005-09-21 23:10:51 +05:00
sergefp@mysql.com
7c590486d3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13317
 2005-09-21 21:39:45 +04:00
sergefp@mysql.com
7aca974fc8 Fix for BUG#13317: Make range optimizer able to produce ranges for "view.field IN (c1,c2)" 
and "view.field BETWEEN c1 AND c2"
 2005-09-21 21:36:15 +04:00
timour@mysql.com
ba9e3ca1a4 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into  mysql.com:/home/timka/mysql/src/4.1-dbg
 2005-09-21 18:58:39 +03:00
serg@serg.mylan
306aa15391 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
 2005-09-21 17:42:44 +02:00