Commit graph

29316 commits

Author SHA1 Message Date
unknown
adf6fc63a1 Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
into  neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup


mysql-test/t/mysqltest.test:
  Auto merged
2006-01-12 18:21:35 +01:00
unknown
7b77b4c7bb Use "test ! -s" to check that file does not exist 2006-01-12 18:19:57 +01:00
unknown
ecd1229a65 Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
into  neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
2006-01-11 11:21:23 +01:00
unknown
113290fe2f Add comments that groups and describes the inits
client/mysqltest.c:
  Add comments
  Group inits logically
2006-01-11 11:10:58 +01:00
unknown
c5451d02ad Remove obsolete comment 2006-01-11 11:07:17 +01:00
unknown
b5fb52dc49 Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.
client/mysqltest.c:
  Remove lineno_stack, instead use the already existing file_stack and add a new variable lineno to keep track of what line in the file we are at.
mysql-test/r/mysqltest.result:
  Correct test result, "At line 1" should be printed
2006-01-11 11:06:26 +01:00
unknown
bbec7eda63 Disable code for "let" to assign each column from query to it's own variable
client/mysqltest.c:
  Disable "let" assign each column of query to own var
mysql-test/r/mysqltest.result:
  Remove test results for disabled test
mysql-test/t/mysqltest.test:
  Disable test for "let assigns each column of query to own var"
2006-01-11 00:24:57 +01:00
unknown
2c0f53d69c 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-01-10 21:43:09 +01:00
unknown
d1111843bf Can't repeat bug#15004, enable tests again 2006-01-10 21:39:12 +01:00
unknown
12c8b61aad Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 18:09:39 +01:00
unknown
31d3c88cae WL#2506: Information Schema tables for PARTITIONing
added I_S 'PARTITIONS' table
2006-01-10 19:44:04 +04:00
unknown
5d5560a503 Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-small_fix
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
2006-01-10 16:00:37 +01:00
unknown
935ad7e8f3 Fix for crashing mysqltest
client/mysqltest.c:
  Allocate one extra byte for string terminator in varname
2006-01-10 15:56:30 +01:00
unknown
1380951d98 Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-01-10 14:56:46 +01:00
unknown
a89284bad1 Fix mysqltest crash problem
client/mysqltest.c:
  Revert to original version of copying name and value into var in var_init
2006-01-10 14:55:39 +01:00
unknown
2fe75c389b Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-10 14:40:05 +02:00
unknown
b49b86aed3 BUG#9483 test was overworked to account reviews finally to leave only REVOKE check.
There is a specific rpl_ignore_grant test case for GRANT.


mysql-test/r/rpl_ignore_revoke.result:
  New BitKeeper file ``mysql-test/r/rpl_ignore_revoke.result''
mysql-test/t/rpl_ignore_revoke-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_ignore_revoke-slave.opt''
mysql-test/t/rpl_ignore_revoke.test:
  New BitKeeper file ``mysql-test/t/rpl_ignore_revoke.test''
2006-01-10 13:44:08 +02:00
unknown
0555413735 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 11:42:20 +01:00
unknown
711ee7486f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-01-10 02:19:01 -08:00
unknown
bee50ef192 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


mysql-test/r/grant.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2006-01-10 11:03:31 +01:00
unknown
cdf2eb4bcd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-10 09:57:59 +01:00
unknown
a670199a4c Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/bug15598/my51-bug15598
2006-01-10 09:20:30 +01:00
unknown
1e1f3743c6 Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-01-10 00:14:39 -08:00
unknown
03bd22be2d Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
config/ac-macros/yassl.m4:
  Auto merged
include/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2006-01-10 08:01:47 +01:00
unknown
1b93e6d8d0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqlslap.result:
  Real output produced, remove "echo"
mysql-test/t/mysqlslap.test:
  Real output produced, remove "echo"
2006-01-10 08:00:17 +01:00
unknown
09ddf79d33 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-09 21:46:33 -08:00
unknown
8fd14af83a Ajustement after merge 2006-01-09 21:44:42 -08:00
unknown
874fea6d28 Removing unneeded include.
sql/ha_archive.h:
  Removed unneeded include.
2006-01-09 21:04:58 -08:00
unknown
df046728e8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-09 18:53:02 -08:00
unknown
c9f5a5cc85 Corrections from code review for auto_increment. Added test cases.
mysql-test/r/archive.result:
  New result file.
mysql-test/t/archive.test:
  Added new tests for indexes. Also accidently updated it so that all "FROM" are now capitalized :)
sql/ha_archive.cc:
  Changed comparision function to compare memory locations. 
  
  Modified function for storing the auto_increment. 
  Removed useless DBUG_PRINT
2006-01-09 18:41:37 -08:00
unknown
e8595bb5bd errmsg.txt:
Fix word.
  (no test results needed fixing)


sql/share/errmsg.txt:
  Fix word.
  (no test results needed fixing)
2006-01-09 20:13:27 -06:00
unknown
08da99aa94 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-rbr_cleanups


sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  accepted Mat's changes to the template defs
2006-01-09 17:35:25 -06:00
unknown
60d827b678 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2006-01-09 13:02:00 -08:00
unknown
7a79331461 Add simple printout from mysqlslap.test to avoid empty result file
mysql-test/r/mysqlslap.result:
  Update test result
mysql-test/t/mysqlslap.test:
  Print something when test is complete
2006-01-09 20:19:06 +01:00
unknown
c9c75cd1be Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/mysqltest.test:
  Changed to "test ! -e" instead of "test -s"
2006-01-09 20:12:18 +01:00
unknown
352d943bb6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 18:06:16 +01:00
unknown
9ade5f6722 Merge neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
into  neptunus.(none):/home/msvensson/mysql/bug15598/my51-bug15598


mysql-test/r/grant.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2006-01-09 18:04:53 +01:00
unknown
63a33172e2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem
2006-01-09 18:01:00 +01:00
unknown
f2319493c4 Version number increase.
configure.in:
  1) Update version, now that 5.1.5 has been cloned.
  2) Get rid of erroneous merge, NDB version is deduced automatically from global version.
2006-01-09 17:26:17 +01:00
unknown
4ae3456ba4 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598


sql/sql_acl.cc:
  Auto merged
2006-01-09 17:18:49 +01:00
unknown
9cfcc32521 Bug #15598 Server crashes in specific case during setting new password
- Comparing host string against NULL caused crash. 
- If host.hostname is NULL treat it as ""


mysql-test/r/grant.result:
  Update test results
mysql-test/t/grant.test:
  Add test for user with host ""
2006-01-09 17:12:26 +01:00
unknown
edcc626da4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem
2006-01-09 17:05:36 +01:00
unknown
cff44050dc Changes to support HP-UX.
sql/log.cc:
  Preprocessor symbol NO_FLAGS used by system on HP-UX.
sql/log_event.h:
  Preprocessor symbol NO_FLAGS used by system on HP-UX.
2006-01-09 16:37:24 +01:00
unknown
73e868f43c Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/mkindahl/bk/fix-mysql-5.1-new
2006-01-09 16:02:14 +01:00
unknown
00ba4659ee Changes to support aCC on HP-UX.
sql/log_event.h:
  Adding enumeration constants since aCC (HP-UX) does not like empty enumerations.
sql/sql_class.cc:
  Adding template parameter as argument to member template function to support aCC on HP-UX.
sql/sql_class.h:
  Adding template parameter as argument to member template function to support aCC on HP-UX.
2006-01-09 15:59:39 +01:00
unknown
48d7d98e7d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
2006-01-09 15:31:38 +01:00
unknown
eea7adc736 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-max
2006-01-09 11:57:58 +01:00
unknown
3f6d319b36 Added synchronization to avoid race condition in tests 2006-01-09 11:53:37 +01:00
unknown
6d8f89b8c2 This changeset adds support for autoincrements to archive. It allows it to have them with both unique and non-unique indexes.
Test cases will come in the next push (just doing this one so I can get a couple of reviews in). This is not the final patch. 


sql/field.h:
  Added val_int() method similar to the one like val_str() that will allow you to pop in another pointer and do a test.
sql/ha_archive.cc:
  Adds auto_increment support to archive. Cleans up a number of other small items.
sql/ha_archive.h:
  More additions for support of autoincrements
2006-01-09 02:35:40 -08:00
unknown
6dd6f60749 Fix "jump to label crosses initialization" compile error. 2006-01-09 11:23:15 +01:00