Commit graph

31371 commits

Author SHA1 Message Date
unknown
3754c4eb1f Makefile.am:
Conditionally link with libmysqlclient.la or libmysqlclient_r.la
configure.in:
  Corrected help text for --with-debug option
  Changed default to be with thread safe client
  Added THREAD_SAFE_CLIENT to be used in 'if' in make files


configure.in:
  Corrected help text for --with-debug option
  Changed default to be with thread safe client
  Added THREAD_SAFE_CLIENT to be used in 'if' in make files
client/Makefile.am:
  Conditionally link with libmysqlclient.la or libmysqlclient_r.la
2006-02-24 01:24:41 +01:00
unknown
9805bd76f6 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release
2006-02-24 00:33:26 +01:00
unknown
bb26549bc0 fix for bug #16400
scripts/mysql_fix_privilege_tables.sh:
  fix the message as per #16399
sql/sql_acl.cc:
  fix the priv per review comment by Serg
2006-02-24 00:29:50 +01:00
unknown
b9697b2056 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/bk/fix-mysql-5.1-release
2006-02-23 22:21:07 +01:00
unknown
e2994b2857 Bug#17678 (RBR format change: moving from VLE to net encoding):
Switching to use net_*_length() instead of VLE functions.


sql/log_event.cc:
  Switching to use net_*_length() instead of VLE functions.
2006-02-23 22:19:47 +01:00
unknown
f2fd3c2781 After-merge fixes (Bug#13134) 2006-02-24 00:12:04 +03:00
unknown
e0b4e228ff Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime
2006-02-24 00:09:47 +03:00
unknown
9519987cf0 Merge mysql.com:/opt/local/work/mysql-4.1-13134
into  mysql.com:/opt/local/work/mysql-5.0-runtime


mysql-test/t/heap.test:
  Auto merged
mysql-test/r/heap.result:
  Manual merge (use local)
mysql-test/r/ps.result:
  Manual merge (use local)
mysql-test/t/ps.test:
  Manual merge.
sql/field.cc:
  Manual merge.
sql/field.h:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
2006-02-24 00:00:15 +03:00
unknown
ea9ea952be Remove 'delayed' to make the test deterministic (already
fixed in 5.0).
A post-review fix (Bug#13134)


mysql-test/r/heap.result:
  Remove 'delayed' to make the test deterministic.
mysql-test/r/ps.result:
  Remove an unneeded drop table (test case for Bug#13134)
mysql-test/t/heap.test:
  Remove 'delayed' to make the test deterministic.
mysql-test/t/ps.test:
  A post-review fix (Bug#13134)
2006-02-23 23:41:15 +03:00
unknown
e16e4ff8f0 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged
2006-02-23 13:56:00 -06:00
unknown
ef1316fadd mysqltest.c:
Rearrange out of order options in option struct.


client/mysqltest.c:
  Rearrange out of order options in option struct.
2006-02-23 13:54:55 -06:00
unknown
263abaebbe Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-23 11:08:16 -06:00
unknown
19ed1c4b31 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-23 11:07:56 -06:00
unknown
82b98e2701 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


sql/mysqld.cc:
  manual merge.
2006-02-23 09:41:04 -06:00
unknown
cffde51342 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-02-23 16:27:07 +01:00
unknown
a3bc77d8de Added missing DBUG_RETURN 2006-02-23 16:25:52 +01:00
unknown
6f6552e107 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqldump.c:
  Auto merged
2006-02-23 16:11:47 +01:00
unknown
5dd2f66eaf mysqld.cc:
Fix out of order entries in option struct.


sql/mysqld.cc:
  Fix out of order entries in option struct.
2006-02-23 09:11:05 -06:00
unknown
c1a0674868 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 16:10:36 +01:00
unknown
7262273457 Change snprintf to my_snprintf
client/mysqldump.c:
  snprintf =>  my_snprintf
2006-02-23 16:08:28 +01:00
unknown
18004dc75d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqldump.c:
  Auto merged
2006-02-23 14:35:57 +01:00
unknown
258ad72c83 Cleanup.
sql/sql_base.cc:
  Cleanup, remove a warning.
sql/sql_select.h:
  Cleanup: remove a warning.
2006-02-23 16:21:43 +03:00
unknown
24c44a9bea Aix52 build fix
client/mysqldump.c:
  Declare variable in start of function
2006-02-23 14:06:29 +01:00
unknown
37bd6647aa Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/users/mkindahl/bk/merge-b17181-mysql-5.1-new


sql/ha_ndbcluster_binlog.cc:
  Auto merged
2006-02-23 13:49:27 +01:00
unknown
7d4c684633 Bug#17181 (mysqlslap test server crash):
Moving assignments to table_map_id for thread-safe handling of
  table shares.


sql/ha_ndbcluster_binlog.cc:
  Assign_new_table_id() now takes table share instead of table.
sql/mysql_priv.h:
  New protptype for assign_new_table_id().
sql/sql_base.cc:
  Assign_new_table_id() now takes a table share instead of a table.
  Moving call to assign_new_table_id() into get_table_share().
sql/table.cc:
  Setting default values of table_map_id and table_map_version inside
  alloc_table_share() and init_tmp_table_share().
  Removing the settings from open_table_from_share().
2006-02-23 13:34:03 +01:00
unknown
cf84a09509 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-new
2006-02-23 14:19:26 +03:00
unknown
b26c3ef461 Fix an const char->char conversion error. 2006-02-23 14:18:17 +03:00
unknown
2707f13566 After merge fix
mysql-test/t/mysqltest.test:
  Fix merge
2006-02-23 10:57:33 +01:00
unknown
97bc92752b Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  Merge with my own merge
mysql-test/t/mysqltest.test:
  Merge
2006-02-23 10:54:56 +01:00
unknown
1cf9f23911 Fix bad merge 2006-02-23 10:51:33 +01:00
unknown
f7295f2438 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
2006-02-23 10:45:39 +01:00
unknown
9ae84f70cf Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge locationwhere to search for client bins
2006-02-23 10:41:37 +01:00
unknown
9b1aa7fa07 Merge fixup
client/mysqltest.c:
  Fix after merge, do_eval has three args
  Remove extre return in do_block
2006-02-23 10:35:53 +01:00
unknown
c330dc839b Fix a bad merge of mine. 2006-02-23 12:32:54 +03:00
unknown
897f8eabf5 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Merge
2006-02-23 10:30:31 +01:00
unknown
44e286d215 Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched.
client/mysqltest.c:
  Add new parameter to 'do_eval' that will add any escape chars found in the input string to the output string. 
  This is used in 'do_system' and in 'do_exec' where only unescaped variables
  will be expanded, rest of the string will be left untouched.
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqldump.test:
  Revert previous patch that added extra \\ in "exec" command
mysql-test/t/mysqltest.test:
  Revert previous patch that added extra \\ in exec command
2006-02-23 10:11:57 +01:00
unknown
436b498570 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
2006-02-23 09:07:30 +01:00
unknown
50ba49988a ndb - enable rpl_ndb_blob* again, disabled by accident
mysql-test/t/disabled.def:
  enable rpl_ndb_blob* again, disabled by accident
2006-02-23 00:35:32 +01:00
unknown
8574fb811b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-22 23:18:45 +01:00
unknown
8535f97511 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-22 23:12:32 +01:00
unknown
216bc447fb rpl_row_mysqlbinlog.result, rpl_row_mysqlbinlog.test:
Updated with echos for the results file requested by lars


mysql-test/t/rpl_row_mysqlbinlog.test:
  Updated with echos for the results file requested by lars
mysql-test/r/rpl_row_mysqlbinlog.result:
  Updated with echos for the results file requested by lars
2006-02-22 23:11:42 +01:00
unknown
150cad6679 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-22 22:59:29 +01:00
unknown
871335f587 ndb - ndb_restore.test: fix backup id in result
mysql-test/r/ndb_restore.result:
  fix backup id using jeb's ndb_backup.inc
mysql-test/t/ndb_restore.test:
  fix backup id using jeb's ndb_backup.inc
2006-02-22 22:04:46 +01:00
unknown
89d572549d New test for wl2321
mysql-test/t/rpl_row_mysqlbinlog.test:
  New mysqlbinlog test for row based binlogs per lars request for WL#2321
mysql-test/t/rpl_row_mysqlbinlog-master.opt:
  New mysqlbinlog test for row based binlogs per lars request for WL#2321
mysql-test/r/rpl_row_mysqlbinlog.result:
  New mysqlbinlog result WL#2321
2006-02-22 22:03:55 +01:00
unknown
9233f62f5a Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-02-22 21:27:46 +01:00
unknown
5e02bec9ce Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1


sql/share/errmsg.txt:
  Auto merged
2006-02-22 14:18:45 -06:00
unknown
ef5d68f339 BUG# 17393: Partitions: Wrong error message when assigning too many subpartitions
We changed the error message to more clearly reflect the fact
that we are counting parts and subparts


mysql-test/r/partition_mgm_err.result:
  updated error message
sql/share/errmsg.txt:
  updated error message
2006-02-22 14:17:11 -06:00
unknown
3150f7ccab Makefile.am:
Change for 'make distcheck'
libmysqld.vcproj:
  Typo


VC++Files/libmysqld/libmysqld.vcproj:
  Typo
mysql-test/ndb/Makefile.am:
  Change for 'make distcheck'
storage/archive/Makefile.am:
  Change for 'make distcheck'
plugin/fulltext/Makefile.am:
  Change for 'make distcheck'
storage/csv/Makefile.am:
  Change for 'make distcheck'
storage/heap/Makefile.am:
  Change for 'make distcheck'
2006-02-22 20:34:25 +01:00
unknown
37afbdc0b0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


sql/ha_ndbcluster_binlog.cc:
  Auto merged
2006-02-22 20:15:24 +03:00
unknown
671d3e1ed5 Post-merge fixes.
sql/ha_ndbcluster_binlog.cc:
  A post-merge fix.
sql/log_event.cc:
  A post-merge fix.
2006-02-22 20:03:25 +03:00