Commit graph

26248 commits

Author SHA1 Message Date
unknown
8962950313 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
2005-09-13 18:01:27 +02:00
unknown
99a2aa2d7d Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


sql/sql_analyse.cc:
  Auto merged
2005-09-13 18:23:37 +03:00
unknown
02fce1c316 Merged code. Removed unneccessary repeating. 2005-09-13 18:11:51 +03:00
unknown
1485e9236c BUG#12526 yassl: Crashes in "integer.cpp"
- Avoid problem with  "Sun C++ 5.6 2004/07/15"


extra/yassl/taocrypt/src/integer.cpp:
  - Remove "inline" from the more advanced functions of class portable
2005-09-13 17:06:14 +02:00
unknown
b5e15568aa Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-13 15:40:04 +02:00
unknown
b6aba9db70 Fixed BUG#12379: PROCEDURE with HANDLER calling FUNCTION with error
get strange result
  according to Monty's suggestions, fixing the SELECT behaviour on errors
  with SP handlers. Note that some warnings from SELECT still shows up when
  the handler has caught - this is an effect of another known bug (BUG#7049).


mysql-test/r/sp.result:
  New test cases for BUG#12379.
mysql-test/t/sp.test:
  New test cases for BUG#12379.
sql/sql_class.cc:
  Abort selects on errors more graceful with SP handlers.
sql/sql_class.h:
  Abort selects on errors more graceful with SP handlers.
2005-09-13 15:32:42 +02:00
unknown
20c8bfe7fa Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/mysql-5.0
2005-09-13 16:54:08 +05:00
unknown
d3f0c62572 Print a dummy section in order not to interference
with /etc/my.cnf and ~/.my.cnf [client] section.
2005-09-13 16:41:39 +05:00
unknown
eece59c2d0 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-13 13:18:15 +02:00
unknown
c53e51afb6 merge 2005-09-13 13:18:14 +02:00
unknown
32dc0aadbb Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-13 12:53:12 +02:00
unknown
468c357a4e Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-2486


sql/sql_parse.cc:
  Auto merged
2005-09-13 13:51:25 +03:00
unknown
902932a1e8 Fixed BUG#13133: Local variables in stored procedures are not initialized correctly.
Have to init. all local variables in their frames, not just once at the beginning
  of invocation.


mysql-test/r/sp.result:
  New test case for BUG#13133.
mysql-test/t/sp.test:
  New test case for BUG#13133.
sql/sp_head.cc:
  Just init. local variable slots in the fram to NULL. (Real init. will be done
  in each block.)
sql/sp_pcontext.cc:
  Removed isset flag, since it's not used.
sql/sp_pcontext.h:
  Removed isset flag, since it's not used.
sql/sql_yacc.yy:
  Initialize local variables in the block to null, or the default value, given.
  (Untabifed block too.)
2005-09-13 12:50:21 +02:00
unknown
e7b5b5c8a5 sql_prepare.cc:
VC6 can't handle initializing const in declaration


sql/sql_prepare.cc:
  VC6 can't handle initializing const in declaration
2005-09-13 10:15:48 +02:00
unknown
b51879f169 minor compile error fix 2005-09-13 10:03:50 +02:00
unknown
b50eb4cd42 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-12 19:34:07 -07:00
unknown
276e9f82b3 innochecksum.c:
Changed from C++ comments to C comments
  Did some adaption to MySQL Coding Style


extra/innochecksum.c:
  Changed from C++ comments to C comments
  Did some adaption to MySQL Coding Style
2005-09-13 02:31:47 +02:00
unknown
8dc5c95b14 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/violite.h:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
configure.in:
  Resolve conflicts
2005-09-12 17:00:50 -07:00
unknown
accf5c264a Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
2005-09-12 16:48:00 -07:00
unknown
74aeffda53 mysql-test-run.pl:
Corrected typo


mysql-test/mysql-test-run.pl:
  Corrected typo
2005-09-13 01:41:15 +02:00
unknown
597b307d66 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2005-09-13 01:22:11 +02:00
unknown
cc537b0766 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged
2005-09-13 01:12:17 +02:00
unknown
4d29b85d14 Merged from 4.1 to 5.0. 2005-09-13 01:44:50 +03:00
unknown
b33da62c5e 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
2005-09-13 01:11:55 +03:00
unknown
3d1658f713 Adding comment for force manual merge 5.0 -> wl1012 2005-09-12 22:47:15 +02:00
unknown
06c2d66e8d Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 12:47:45 -07:00
unknown
38b2cd733b Update test result
mysql-test/r/ndb_autodiscover.result:
  Update results
2005-09-12 12:45:03 -07:00
unknown
333bc203d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
2005-09-12 20:41:50 +02:00
unknown
c231cb6a04 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  selena.:H:/MYSQL/src/#05588-mysql-4.1


include/my_global.h:
  Auto merged
2005-09-12 22:19:04 +04:00
unknown
7254e748fe Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into  kite-hub.kitebird.com:/tmp/merge-4.1
2005-09-12 12:53:49 -05:00
unknown
6c8e4044b3 Merge kite-hub.kitebird.com:/tmp/merge-4.0
into  kite-hub.kitebird.com:/tmp/merge-4.1


README:
  Auto merged
2005-09-12 12:44:52 -05:00
unknown
d262a6e0a0 README:
Update README (2nd try)


README:
  Update README (2nd try)
2005-09-12 12:44:13 -05:00
unknown
4975a7f9f8 Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco
into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
2005-09-12 10:19:56 -07:00
unknown
8c3423652d Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


mysql-test/r/temp_table.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
sql/sql_db.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/create.result:
  Merged from 4.1 to 5.0
mysql-test/r/innodb.result:
  Merged from 4.1 to 5.0
mysql-test/t/create.test:
  Merged from 4.1 to 5.0
sql/item_cmpfunc.cc:
  Merged from 4.1 to 5.0
sql/sql_table.cc:
  Merged from 4.1 to 5.0
2005-09-12 20:18:49 +03:00
unknown
3462573fa8 BUG#12943 - post-merge fix
mysql-test/r/select.result:
  post-merge fix
mysql-test/t/select.test:
  post-merge fix
2005-09-12 19:18:17 +03:00
unknown
e08e620c3e Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-12943


sql/sql_parse.cc:
  Auto merged
mysql-test/r/select.result:
  merge BUG#12943
mysql-test/t/select.test:
  merge BUG#12943
2005-09-12 19:05:55 +03:00
unknown
3f40506633 Corrected construct of faked Node fail signals in ndb SignalSender 2005-09-12 17:49:48 +02:00
unknown
17233698fc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 20:49:48 +05:00
unknown
3ad213baca Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mishka.mysql.com:/home/my/mysql-4.1
2005-09-12 18:49:47 +03:00
unknown
90ca6d15b3 Review fixes since last pull
Fix for bug #13025; Server crash in filesort because wrong call to handler::position()


client/mysqltest.c:
  Code cleanup during review
mysql-test/r/innodb.result:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
mysql-test/t/innodb.test:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
sql/filesort.cc:
  Don't call handler::position() if row was not found
sql/item_cmpfunc.cc:
  Indentation changes
sql/sql_select.cc:
  Moved variable to outer level
2005-09-12 18:48:17 +03:00
unknown
5dd24cbe00 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2005-09-12 19:38:53 +05:00
unknown
95fecf34e2 Many files:
Adding esperanto collation


strings/ctype-uca.c:
  Adding esperanto collation
mysys/charset-def.c:
  Adding esperanto collation
mysql-test/t/ctype_uca.test:
  Adding esperanto collation
mysql-test/r/ctype_uca.result:
  Adding esperanto collation
config/ac-macros/character_sets.m4:
  Adding esperanto collation
2005-09-12 19:35:50 +05:00
unknown
d2789003b3 Fix for BUG#6808.
The problem was in that add_table_to_list was testing for duplicate tables
in a list of tables that included the created view.


mysql-test/r/view.result:
  Test for BUG#6808
mysql-test/t/view.test:
  Test for BUG#6808
sql/sql_parse.cc:
  When testing for table name uniquness, skip the first table the current
  statement is CREATE VIEW. Notice that the first table is skipped differently
  for CREATE TABLE ... SELECT ... statements, so we don't have to handle that
  case here (see production 'create_select', the call 'to save_and_clear').
2005-09-12 17:01:17 +03:00
unknown
49e734e67c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 17:43:02 +05:00
unknown
bab5cb7834 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 17:33:21 +05:00
unknown
c29e0f709c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-12 14:30:52 +02:00
unknown
4efcca023b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0


mysql-test/t/rpl_slave_status.test:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
2005-09-12 14:11:28 +02:00
unknown
63080dc200 Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
produce warning for 'create database if not exists' if database exists
  do not update database options in this case  
  produce warning for 'create table if not exists' if table exists



mysql-test/r/create.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/temp_table.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/warnings.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/t/create.test:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    test case
sql/sql_db.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create database if not exists' if database exists
    do not update database options in this case
sql/sql_table.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create table if not exists' if table exists
2005-09-12 17:09:19 +05:00
unknown
0a3202bedf removed a few aborts from mgmapi
corrected typo in ndb Parser
2005-09-12 14:03:23 +02:00
unknown
39c2107eb2 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
2005-09-12 13:00:55 +02:00