Commit graph

12213 commits

Author SHA1 Message Date
unknown
8746b6a102 More small WL#1622 fixes: Allocate name of Prepared Statement on PS's mem_root.
sql/sql_prepare.cc:
  Allocate name of Prepared Statement on PS's mem_root.
2004-04-30 20:44:46 +04:00
unknown
47322bf9b8 WL#1622 "SQL Syntax for Prepared Statements" - cosmetic code review fixes
mysql-test/r/ps.result:
  Added check if multiple SQL statements inside a PS are disabled
mysql-test/t/ps.test:
  Added check if multiple SQL statements inside a PS are disabled
2004-04-30 20:08:38 +04:00
unknown
85f85a8548 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
2004-04-30 19:24:57 +04:00
unknown
541cef7568 Fix client_test to use new statement assertion macros 2004-04-30 17:21:06 +04:00
unknown
2668cb018e Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-04-30 14:34:44 +02:00
unknown
c8f807a6fe - reverted change to fill_help_tables.sh ("Added checking of maximum
length of line in output (Bug #2874)" from last ChangeSet (should not
   have been applied)


scripts/fill_help_tables.sh:
   - reverted change "Added checking of maximum length of line in output 
     (Bug #2874)" from last ChangeSet (should not have been applied)
2004-04-30 14:31:52 +02:00
unknown
e8f201337d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug3420


tests/client_test.c:
  Auto merged
2004-04-30 16:28:04 +04:00
unknown
dc861599cd Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-30 14:16:34 +02:00
unknown
4f424faffd Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug3420


tests/client_test.c:
  Auto merged
2004-04-30 15:32:41 +04:00
unknown
7bf15f4b79 Only calculate MYSQL_FIELD->max_length if mysql_stmt_attr_set(..., STMT_ATTR_UPDATE_MAX_LENGTH) is done.
tests/client_test.c:
  Test mysql_stmt_attr_set(...STMT_ATTR_UPDATE_MAX_LENGTH)
2004-04-30 14:24:06 +03:00
unknown
72c7b3529e Merge
libmysql/libmysql.c:
  Auto merged
tests/client_test.c:
  Auto merged
include/mysql.h:
  SCCS merged
2004-04-30 14:04:51 +03:00
unknown
15c2bb61f5 Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)
Added checking of cut read lines in bootstrap thread (Bug #2874)


include/mysql.h:
  Added length to MYSQL_ROWS to enable sanity checking of packets
  Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result()
libmysql/libmysql.c:
  Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)
scripts/fill_help_tables.sh:
  Added checking of maximum length of line in output (Bug #2874)
scripts/mysql_install_db.sh:
  Added error message if help tables couldn't be done (Bug #2874)
sql/sql_parse.cc:
  Added checking of cut read lines in bootstrap thread (Bug #2874)
tests/client_test.c:
  Added --debug
  Changed some strange define names
  Less output
  Added testing of max_length for prepared statements
2004-04-30 14:02:17 +03:00
unknown
41dfe1514d Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-30 10:43:59 +02:00
unknown
b36398fe0d compatibility fix (bug#3606) 2004-04-30 10:42:12 +02:00
unknown
be5d750a24 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-u2


include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Auto merged
2004-04-30 03:00:55 +04:00
unknown
d5237fd09f Fix for Bug#3035 "Prepared statement integer inserts": now unsigned
flag is sent to server with placeholder types.
There were no need to extend the protocol as one additional byte
was reserved for placeholder code, when placeholder code is in range 0-255.
So this byte is now used for flags. Post-review fixes added.


include/config-win.h:
  added floaststore implementation
include/my_global.h:
  added floatstore implementation
include/mysql.h:
  Bug#3035:
  added 'is_unsigned' member
  binary_data wasn't used, removed
  null_field wasn't necessary, removed
include/mysql_com.h:
  Unused defines were removed.
libmysql/libmysql.c:
  Function store_param_type was removed - too much for a function, especially
  with bug in it.
  New implementation is inline and takes into account signedness of 
  placeholder.
  Fixed store functions to not perform double network-host order conversion
  on high-byte-first systems (should also fix Bug#3578 "Prepared statement 
  integer conversions work wrong in 64-bit Power Mac G5 CPUs").
  null_field removed.
sql/sql_prepare.cc:
  Placeholder sign is taken into account when reading data from network.
tests/client_test.c:
  Test for BUG#3035 added: insert and retrieve minimum and maximum of all
  integer types.
2004-04-30 03:00:19 +04:00
unknown
63e75e7b85 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-04-30 00:15:39 +03:00
unknown
f4b02f9937 Portability fixes
mysql-test/mysql-test-run.sh:
  Avoid 'too many arguments' error
mysql-test/t/system_mysql_db_fix-master.opt:
  Add missing newline
scripts/mysql_fix_privilege_tables.sh:
  Portability fix
2004-04-30 00:14:56 +03:00
unknown
258a3d1678 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-04-30 01:03:19 +04:00
unknown
e73e26f381 Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set
requested by Monty for Bug#1647 (No way to determine what size 
blob/clob is being returned into bound buffer)


include/mysql.h:
  Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set 
  requested by Monty for Bug#1647.
libmysql/libmysql.c:
  Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set 
  requested by Monty for Bug#1647.
libmysql/libmysql.def:
  Windows .defs added for new API calls
2004-04-30 01:02:29 +04:00
unknown
f9038942fa Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space/tomas/mysql-4.1-make
2004-04-29 22:00:56 +02:00
unknown
242fe78d2b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-my-ps-bugs


tests/client_test.c:
  Auto merged
2004-04-30 00:00:54 +04:00
unknown
6de9b596b2 SrcDist.sh, Epilogue.mk:
improved distdir


ndb/Epilogue.mk:
  improved distdir
ndb/SrcDist.sh:
  improved distdir
2004-04-29 21:22:03 +02:00
unknown
9d3d017c6c configure.in:
added configure options PACKAGE and VERSION for ndb
GuessConfig.sh:
  added options for PACKAGE and VERSION
Epilogue.mk:
  Added target distdir


ndb/Epilogue.mk:
  Added target distdir
ndb/config/GuessConfig.sh:
  added options for PACKAGE and VERSION
configure.in:
  added configure options PACKAGE and VERSION for ndb
2004-04-29 20:25:00 +02:00
unknown
a8dfb78df0 SrcDist.sh:
new file
2004-04-29 19:48:46 +02:00
unknown
0c661e2c60 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-04-29 19:46:01 +02:00
unknown
e3a6ef83bb - added option for building/packaging the NDB cluster to Do-compile
Build-tools/Do-compile:
   - added option for building/packaging the NDB cluster
2004-04-29 19:12:27 +02:00
unknown
3594adb165 InnoDB: implement LOCK TABLE (Bug #3299)
innobase/include/lock0lock.h:
  Add lock_table_unlock() and lock_release_tables_off_kernel()
  Add LOCK_TABLE_EXP
innobase/include/row0mysql.h:
  Add row_unlock_table_for_mysql() and row_lock_table_for_mysql()
innobase/include/trx0trx.h:
  Add n_tables_locked
innobase/lock/lock0lock.c:
  Add LOCK_TABLE_EXP for explicit LOCK TABLE commands
  Add lock_table_unlock()
  Add lock_release_tables_off_kernel()
innobase/row/row0mysql.c:
  Add row_unlock_table_for_mysql() and row_lock_table_for_mysql()
innobase/trx/trx0trx.c:
  Add n_tables_locked
mysql-test/r/innodb.result:
  Updated handling of auto_inc columns
sql/ha_innodb.cc:
  Call row_lock_table_for_mysql() and row_unlock_table_for_mysql()
2004-04-29 16:42:33 +03:00
unknown
4048fe5c30 - added AC_PROG_LIBTOOL to innobase/configure.in to be able to compile
MySQL with InnoDB on IBM AIX 5.2 in 64bit mode (which requires a special
   AR flag)
2004-04-29 14:48:49 +02:00
unknown
c5daed7c89 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-04-29 12:26:39 +02:00
unknown
709a4a9ff2 postreview fixes 2004-04-29 12:25:56 +02:00
unknown
b7468a97a2 Portability fix (for AIX)
innobase/pars/lexyy.c:
  Add missing include file (Needed for AIX)
2004-04-29 13:18:20 +03:00
unknown
c008eb0425 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-04-28 23:46:16 +02:00
unknown
2a5d6bdc39 Very small fixes for testsuite (a real_sleep instead of sleep, plus TCP port independency of the result file).
mysql-test/r/rpl_server_id1.result:
  be port-independent
mysql-test/r/rpl_server_id2.result:
  be port-independent
mysql-test/t/rpl_error_ignored_table.test:
  we want to sleep 2 secs, not more; if we allow ourselves to sleep >=10 seconds, then
  the get_lock() will be aborted and we will arrive to late for the KILL to have
  the desired effect of generating an error code in the binlog.
mysql-test/t/rpl_server_id1.test:
  be port-independent
mysql-test/t/rpl_server_id2.test:
  be port-independent
2004-04-28 23:43:46 +02:00
unknown
ae629fff86 Allow one to send empty strings with mysql_stmt_send_long_data()
mysql_stmt_reset() now resets param->long_data_used
Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
Fixed problem with symlink test (bug in 4.1.2)


libmysql/libmysql.c:
  Allow one to send empty strings with mysql_stmt_send_long_data()
  mysql_stmt_reset() now resets param->long_data_used
mysys/default.c:
  Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
sql/unireg.cc:
  Fixed problem with symlink test:  .frm table was not properly deleted if handler create failed
2004-04-28 20:19:50 +03:00
unknown
d30a350d7a my-medium.cnf.sh:
Correct typo, and fix up rest of sentence as well.


support-files/my-medium.cnf.sh:
  Correct typo, and fix up rest of sentence as well.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-04-28 11:50:32 -05:00
unknown
b1f590203e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-04-28 18:31:31 +02:00
unknown
87a93a3195 A new option --replicate-same-server-id to force a slave to execute queries originating from itself
(WL#794). This can be of interest in some recovery-from-backup scenarios, and also when you have
two databases in one mysqld, having a certain similarity and you want one db to be updated when the other is
(some sort of trigger).
Plus small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT"


sql/mysqld.cc:
  new option --replicate-same-server-id
sql/slave.cc:
  new option replicate_same_server_id, to force a slave to execute its own queries.
  Small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT"
sql/slave.h:
  new option --replicate-same-server-id
2004-04-28 18:24:46 +02:00
unknown
7afbb734b7 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-04-28 18:38:30 +03:00
unknown
8702628029 Merge ltantony.dsl-verizon.net:/usr/home/antony/work/mysql-4.0
into ltantony.dsl-verizon.net:/usr/home/antony/work/bug3481


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
2004-04-28 16:38:29 +01:00
unknown
2902f9e8a5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-04-28 19:27:56 +04:00
unknown
0d07fe42c3 Fix for Bug 3481
CREATE statement allowed extra unnecessary commas


mysql-test/r/alias.result:
  Extra comma removed in CREATE statement
mysql-test/r/create.result:
  New test for Bug 3481
mysql-test/r/func_str.result:
  Extra comma removed in CREATE statement
mysql-test/r/rpl_multi_update.result:
  Extra comma removed in CREATE statement
mysql-test/t/alias.test:
  Extra comma removed in CREATE statement
mysql-test/t/create.test:
  New test for bug 3481
mysql-test/t/func_str.test:
  Extra comma removed in CREATE statement
mysql-test/t/rpl_multi_update.test:
  Extra comma removed in CREATE statement
sql/sql_yacc.yy:
  Fix for bug 3481
    No path through the grammar which has no clauses
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-04-28 16:14:53 +01:00
unknown
8b9ecce08c Fixed http address in some scripts (Bug #3460)
Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) (portability fix)
Fixed that INTERVAL can handle big integers. (Bug #3498)
Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473)


mysql-test/mysql-test-run.sh:
  Fixed wrong http address (Bug #3460)
mysql-test/r/func_time.result:
  Results for new test cases
mysql-test/t/func_time.test:
  Added test of INTERVAL with big integers
scripts/mysqld_safe.sh:
  Added html address to manual in case of error
sql/field.cc:
  Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19))
sql/item_timefunc.cc:
  Fixed that INTERVAL can handle big integers. (Bug #3498)
sql/mysql_priv.h:
  Removed not needed prototype
sql/sql_acl.cc:
  Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473)
  Moved GRANT_TABLE::GRANT_TABLE functions ou from class definition to make it possible to debug them
sql/structs.h:
  Fix for long values to INTERVAL
2004-04-28 17:45:08 +03:00
unknown
d79717f96a typo fixed 2004-04-28 16:40:21 +02:00
unknown
4118e3fb97 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-04-28 17:06:09 +03:00
unknown
74b70e0d73 InnoDB: make UNIV_SYNC_DEBUG useable again
innobase/include/sync0sync.h:
  mutex_get_debug_info(): add const qualifier
innobase/srv/srv0start.c:
  Set srv_monitor_file_mutex at level SYNC_NO_ORDER_CHECK
innobase/sync/sync0arr.c:
  sync_array_detect_deadlock(): Remove extraneous declaration of "lock"
innobase/sync/sync0sync.c:
  mutex_get_debug_info(): add const qualifier
2004-04-28 17:03:26 +03:00
unknown
3ac0c7d85d memory overflow in replace.c fixed 2004-04-28 15:46:08 +02:00
unknown
ad3d7a210d bug#3529 - my_getopt doesn't process short OPT_ARG options correctly
cleanup
2004-04-28 15:33:03 +02:00
unknown
fdee1cbbb4 bug#3556 - soundex 2004-04-28 14:19:02 +02:00
unknown
1fa5853260 Split Ndberror.cpp so it can be used by perror 2004-04-28 10:49:51 +02:00