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

12862 commits

Author SHA1 Message Date
pem@mysql.com
e585315703 Additional fix for BUG#7049, after review. 
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
 2005-10-17 15:07:47 +02:00
pem@mysql.com
6a88684eb3 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/bug7049/mysql-5.0
 2005-10-12 16:39:39 +02:00
pem@mysql.com
304d4f580b Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13510/mysql-5.0
 2005-10-12 14:45:34 +02:00
sergefp@mysql.com
6266243deb Fix compile error on Windows: remove wrong typecast 2005-10-12 16:43:55 +04:00
pem@mysql.com
171f83944f Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13510/mysql-5.0
 2005-10-12 13:37:36 +02:00
pem@mysql.com
b9b8349b3a Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13616/mysql-5.0
 2005-10-12 11:52:37 +02:00
pem@mysql.com
f3af927fff Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13616/mysql-5.0
 2005-10-12 10:26:35 +02:00
gluh@eagle.intranet.mysql.r18.ru
4b2a0f0c70 after merge fix 2005-10-12 13:18:46 +05:00
gluh@mysql.com
d19c85199f 4.1->5.0 merge 2005-10-12 11:54:12 +05:00
monty@mysql.com
5513ab69b7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-12 00:59:52 +03:00
monty@mysql.com
f5fdf3e87a Reviewing new pushed code 
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
  (Some old systems returns ETIME and it's safer to test for both values
   than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
 2005-10-12 00:58:22 +03:00
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
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
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
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
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
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
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
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
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