mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33022 commits 2785 branches 343 tags 1.6 GiB
Commit graph

33022 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
707980605d Added --p for producing output parsable by LOAD TABLE INFILE 2006-04-11 14:09:04 +02:00
unknown
6b7e19af4f Fixes for fast alter table for ndbcluster 2006-04-11 14:06:32 +02:00
unknown
1ef739636a Fix for bug #14360: Date Between Interval Broken. 
mysql-test/r/innodb.result:
  Fix for bug #14360: Date Between Interval Broken.                               
    - test case.
mysql-test/t/innodb.test:
  Fix for bug #14360: Date Between Interval Broken.                               
    - test case.
sql/item_timefunc.cc:
  Fix for bug #14360: Date Between Interval Broken.                               
    - Item_date_add_interval::eq() introduced.
sql/item_timefunc.h:
  Fix for bug #14360: Date Between Interval Broken.                               
    - Item_date_add_interval::eq() introduced.
 2006-04-11 16:13:57 +05:00
unknown
3d860b131a Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2006-04-11 12:41:26 +02:00
unknown
718d66e698 Remove the my_seek calls as we have just opened the file for append with O_APPEND and the file pointer should be at end of the file already. 
storage/csv/ha_tina.cc:
  Remove the my_seek calls as we have just opened the file for append with O_APPEND and the file pointer should be at end of the file already
 2006-04-11 12:38:21 +02:00
unknown
c73df2254f Merge 192.168.0.10:mysql/mysql-5.1 
into  shellback.:C:/mysql/my51-bug17368


sql/ha_partition.cc:
  Auto merged
 2006-04-11 12:19:28 +02:00
unknown
ea28e412ec Remove unused variable 2006-04-11 12:15:57 +02:00
unknown
79a2debe46 Close share->data_file in before renaming in ha_tina::repair 
Open and seek to end of data_file after rename 
Fix comment for when file does not need repair.
Set share->mapped_file to NULL always when it's been unmapped 
Add test to see that file can be used after repair


mysql-test/r/csv.result:
  Add more test to see that the table can be used after repair
mysql-test/t/csv.test:
  Add more test to see that the table can be used after repair
storage/csv/ha_tina.cc:
  Close share->data_file in before renaming in ha_tina::repair
  Open and seek to end after rename
  Fix comment for when file does not need repair.
  Set share->mapped_file to NULL always when it's been unmapped
 2006-04-11 12:12:48 +02:00
unknown
08dd4932ce Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-11 11:43:51 +02:00
unknown
7fc5eaadb1 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-04-11 13:28:09 +05:00
unknown
6c0cfad17b Bug#16233: XML: ExtractValue() fails with special characters 
ExtractValue didn't understand tag and attribute names
consisting of "tricky" national letters (e.g. latin accenter letters).
It happened because XPath lex parser recognized only basic
latin letter a..z ad a part of an identifier.

Fixed to recognize all letters by means of new "full ctype" which
was added recently.


mysql-test/r/xml.result:
  Adding test case
mysql-test/t/xml.test:
  Adding test case
sql/item_xmlfunc.cc:
  Using recently implemented "true" ctype functionality
      to treat all national letters as valid tag names,
      Only basic latin letters worked so far.
strings/ctype-simple.c:
  A bug fix: ctype is array of 257 elements,
      adding offset to address correct element.
 2006-04-11 13:25:02 +05:00
unknown
49ded3709b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-11 10:17:13 +02:00
unknown
5f786925a8 enabling all failing ndb tests to get current status in pushbuild 2006-04-11 10:15:08 +02:00
unknown
c8f24984dc Remove extra "," 2006-04-11 10:03:04 +02:00
unknown
7b7cabcbc3 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
 2006-04-11 09:54:00 +02:00
unknown
3307de7213 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
 2006-04-11 09:52:08 +02:00
unknown
3b1a0c8738 Add surrounding braces, move invalidate dictionary_cace to after declaration of variable "table_list" 2006-04-11 09:46:03 +02:00
unknown
bb90de39c0 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql-common/client.c:
  Auto merged
 2006-04-11 09:11:36 +02:00
unknown
3c3928089f Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
 2006-04-11 09:09:21 +02:00
unknown
4c46f306db Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2006-04-11 08:46:48 +02:00
unknown
050100dfca Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/type_bit.result:
  Auto merged
mysql-test/r/type_bit_innodb.result:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/field.cc:
  Resolve merge conflict
 2006-04-10 20:18:12 -07:00
unknown
77e01332ca Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
 2006-04-10 22:34:15 -04:00
unknown
79002cd02e BUG#18752: Also handle NULL values in VALUES LESS THAN 
mysql-test/r/partition.result:
  Added test case to verify that VALUES LESS THAN (NULL) isn't allowed
mysql-test/t/partition.test:
  Added test case to verify that VALUES LESS THAN (NULL) isn't allowed
sql/share/errmsg.txt:
  Added new error message
sql/sql_yacc.yy:
  Added error check for null value
 2006-04-10 22:29:11 -04:00
unknown
0957814dc5 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-10 18:17:01 -07:00
unknown
aacf8e3a48 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-04-10 17:48:20 -07:00
unknown
b9dfe9861a Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-04-10 17:48:19 -07:00
unknown
7c1d127680 Drop a number of OS2 specific files. 
BitKeeper/deleted/.del-BldLevel.cmd~d1a41ef0712190e1:
  Delete: os2/BldLevel.cmd
BitKeeper/deleted/.del-BldLevelInf.cmd~49e29c82b3527c4a:
  Delete: os2/BldLevelInf.cmd
BitKeeper/deleted/.del-BldLevel.RES~6701a23a4d0b0f33:
  Delete: os2/BldLevel.RES
BitKeeper/deleted/.del-BldLevel.rc~fdab305a1b550012:
  Delete: os2/BldLevel.rc
BitKeeper/deleted/.del-ChangeLog.os2~c473e6f17539eb4:
  Delete: os2/ChangeLog.os2
BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713:
  Delete: os2/Makefile.am
BitKeeper/deleted/.del-build-all.cmd~68479264bb9abe:
  Delete: os2/build-all.cmd
BitKeeper/deleted/.del-MySQL-Client.icc~1d41cb9ed34c28ce:
  Delete: os2/MySQL-Client.icc
BitKeeper/deleted/.del-mysql-inf.wis~fce577336b6bb0e:
  Delete: os2/mysql-inf.wis
BitKeeper/deleted/.del-mysqlalt.wis~409d76f4dfd1e4c4:
  Delete: os2/mysqlalt.wis
BitKeeper/deleted/.del-MySQL-Opt.icc~b9517e18e6cf6c05:
  Delete: os2/MySQL-Opt.icc
BitKeeper/deleted/.del-MySQL-Source.icc~edded3c3a5cf83b1:
  Delete: os2/MySQL-Source.icc
BitKeeper/deleted/.del-MySQL-Sql.icc~2ec2a87f4a096d31:
  Delete: os2/MySQL-Sql.icc
BitKeeper/deleted/.del-MySQL-Sql.irs~266e93e2c9003567:
  Delete: os2/MySQL-Sql.irs
BitKeeper/deleted/.del-MySQL-Util.icc~e6288097ceb9cbd2:
  Delete: os2/MySQL-Util.icc
BitKeeper/deleted/.del-MySQL-Util.irs~cc5eb078dbc0605c:
  Delete: os2/MySQL-Util.irs
BitKeeper/deleted/.del-mysql.wis~95ebdebeb470c823:
  Delete: os2/mysql.wis
BitKeeper/deleted/.del-ReadMe.txt~573b1e4ebab241e1:
  Delete: os2/ReadMe.txt
BitKeeper/deleted/.del-rint.cmd~49a7df1e6a4214af:
  Delete: os2/rint.cmd
BitKeeper/deleted/.del-rint.obj~e6bbb137ffb2f3d1:
  Delete: os2/rint.obj
BitKeeper/deleted/.del-rint.s~82358ca146718a12:
  Delete: os2/rint.s
BitKeeper/deleted/.del-config.h~1e58e9b6b3735392:
  Delete: os2/include/config.h
BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f:
  Delete: os2/include/Makefile.am
BitKeeper/deleted/.del-pwd.h~b26f27954da3a1be:
  Delete: os2/include/pwd.h
BitKeeper/deleted/.del-sgtty.h~4321c310847cb55c:
  Delete: os2/include/sgtty.h
BitKeeper/deleted/.del-termio.h~b136a899c396cb69:
  Delete: os2/include/termio.h
BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c:
  Delete: os2/include/sys/Makefile.am
BitKeeper/deleted/.del-file.h~90a5c4f6c7dfb5a:
  Delete: os2/include/sys/file.h
BitKeeper/deleted/.del-config-os2.h~a16b51851ddd317b:
  Delete: include/config-os2.h
BitKeeper/deleted/.del-my_os2cond.c~e3b520af1c371bb5:
  Delete: mysys/my_os2cond.c
BitKeeper/deleted/.del-my_os2dirsrch.c~4e2479b2abb2eb5a:
  Delete: mysys/my_os2dirsrch.c
BitKeeper/deleted/.del-my_os2dirsrch.h~5011cbc657537d0:
  Delete: mysys/my_os2dirsrch.h
BitKeeper/deleted/.del-my_os2dlfcn.c~6d94b488717683dd:
  Delete: mysys/my_os2dlfcn.c
BitKeeper/deleted/.del-my_os2dlfcn.h0~eae8edb8555eff87:
  Delete: mysys/my_os2dlfcn.h0
BitKeeper/deleted/.del-my_os2file64.c~251fb8a1e950c31b:
  Delete: mysys/my_os2file64.c
BitKeeper/deleted/.del-my_os2mutex.c~79f7438bfde5132a:
  Delete: mysys/my_os2mutex.c
BitKeeper/deleted/.del-my_os2thread.c~65dca991548cec2a:
  Delete: mysys/my_os2thread.c
BitKeeper/deleted/.del-my_os2tls.c~58ade7a0f70ad5ea:
  Delete: mysys/my_os2tls.c
Makefile.am:
  Removed os2 reference
configure.in:
  Removed OS2 specific os2 files.
include/Makefile.am:
  Removed os2 specific config file.
include/my_global.h:
  Removed OS2 specific files.
mysys/Makefile.am:
  Removed OS2 specific files.
 2006-04-10 17:48:19 -07:00
unknown
2cf4bf8c98 mysql_upgrade.c: 
No declarations after first expression in block


client/mysql_upgrade.c:
  No declarations after first expression in block
 2006-04-11 02:48:19 +02:00
unknown
814f766844 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-04-11 02:48:18 +02:00
unknown
69e54f84ec Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
 2006-04-10 17:48:17 -07:00
unknown
c2feb2141e Merge 
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/log.cc:
  Auto merged
 2006-04-11 02:48:17 +02:00
unknown
099e770e7d Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  big_geek.:C:/Work/mysql/mysql-5.1-test
 2006-04-10 19:48:16 -05:00
unknown
94c3287616 manual merge 2006-04-10 20:48:15 -04:00
unknown
e70d0971df Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-10 16:17:46 -07:00
unknown
15bec6c5e5 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
 2006-04-10 14:30:00 -07:00
unknown
6978949b49 Made the test case for bug #15917 independent on platforms. 2006-04-10 14:14:20 -07:00
unknown
384ba540d2 fix cmake generation error 
libmysqld/cmakelists.txt:
  added generated flag to sql_yacc.cc and sql_yacc.h
 2006-04-10 16:06:17 -05:00
unknown
4bc86a89fa disabled.def: 
Disabled randomly failing tests


mysql-test/t/disabled.def:
  Disabled randomly failing tests
 2006-04-10 22:51:17 +02:00
unknown
7d384e4633 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-10 13:04:25 -07:00
unknown
9f55b7cb13 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
 2006-04-11 00:32:36 +05:00
unknown
db97230ecf Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
 2006-04-11 00:32:35 +05:00
unknown
2d8c3c3abe Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-04-10 21:32:35 +02:00
unknown
c7a563ba10 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.upgrd
 2006-04-11 00:32:34 +05:00
unknown
dba879409b Merge mysql.com:/home/alexi/bugs/mysql-5.0-temp 
into  mysql.com:/home/alexi/bugs/mysql-5.1-temp


mysql-test/r/innodb.result:
  Null-merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto-merge
 2006-04-10 23:32:33 +04:00
unknown
e55b495d8b Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2006-04-10 20:48:10 +02:00
unknown
fc1a194ef2 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.0-tmp
 2006-04-10 20:48:09 +02:00
unknown
282ddcbecb Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868 
into  mysql.com:/home/alexi/bugs/mysql-5.0-15868-work
 2006-04-10 22:48:08 +04:00
unknown
7897a3613a Fixed test case result (after BUG#15868 fix). 2006-04-10 22:44:01 +04:00
unknown
2ccae984d1 Merge mysql.com:/home/jimw/my/mysql-5.0-13601 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-10 11:23:30 -07:00
unknown
e10f0d9b98 Make line endings consistent, use Unix format 2006-04-10 20:04:36 +02:00