database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-06 13:10:12 +03:00
Code Activity
42,100 Commits 3,261 Branches 1,092 Tags
c7b6685f9fb33f88eb10c68366f3e1f99173f2ad
Commit Graph

2441 Commits

Author SHA1 Message Date
unknown
36701f1840 fix for SQL_CALC_FOUND_ROWS in UNION's 2002-04-03 17:52:31 +03:00
unknown
8f92cd0384 mirrors.texi: 
Update


Docs/mirrors.texi:
  Update
 2002-04-02 23:02:50 +03:00
unknown
6a5c6b171f Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
 2002-04-02 19:52:58 +03:00
unknown
5560713590 Merge 
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
readline/Makefile.am:
  Auto merged
sql/convert.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
 2002-04-02 19:46:26 +03:00
unknown
a8a63101d0 Fix for HAVE_QUERY_CACHE 
Remove not used flag CLIENT_CHANGE_USER


Docs/manual.texi:
  Cleanup examples
acconfig.h:
  Fix for HAVE_QUERY_CACHE
configure.in:
  Fix for HAVE_QUERY_CACHE
include/my_global.h:
  Fix for HAVE_QUERY_CACHE
include/mysql_com.h:
  Remove not used flag CLIENT_CHANGE_USER
libmysqld/libmysqld.c:
  Fix new prototypes
 2002-04-02 19:10:55 +03:00
unknown
3c64d25033 manual.texi BIT/BOOL are synonyms from TINYINT(1), not CHAR(1) 
Docs/manual.texi:
  BIT/BOOL are synonyms from TINYINT(1), not CHAR(1)
 2002-04-02 09:32:26 -06:00
unknown
c95270b8c4 Cleanups 
Don't use DBUG library for struct st_my_thread_var to make code less complicated.


Docs/manual.texi:
  Cleanup
acinclude.m4:
  Search after openssl in /usr/local
client/mysql.cc:
  Fix prompt
client/mysqladmin.c:
  Cleanup
client/mysqltest.c:
  Cleanup
include/my_pthread.h:
  Move thread variables to the right location
include/my_sys.h:
  Move thread variables to the right location
include/mysql.h:
  Clean up client prototypes
libmysql/libmysql.c:
  Clean up client prototypes
mysys/my_static.h:
  Cleanup
mysys/my_thr_init.c:
  Don't use DBUG library for struct st_my_thread_var to make code less complicated
sql/item_cmpfunc.cc:
  Small optimization
sql/net_pkg.cc:
  Cleanup
sql/sql_parse.cc:
  Allow VARCHAR(0)
 2002-04-02 17:54:57 +03:00
unknown
a09180c91c manual.texi Mods related to UNSIGNED floating-point types. 
Docs/manual.texi:
  Mods related to UNSIGNED floating-point types.
 2002-03-31 15:53:13 -06:00
unknown
1baa106cc5 manual.texi Clarify that LIMIT args must be integer constants. 
Docs/manual.texi:
  Clarify that LIMIT args must be integer constants.
 2002-03-30 11:35:53 -06:00
unknown
ecb6d95d3f manual.texi Add NOT BETWEEN operator. 
Docs/manual.texi:
  Add NOT BETWEEN operator.
 2002-03-29 19:03:25 -06:00
unknown
04b22600ae manual.texi Change note mod, 4.0.2. 
Docs/manual.texi:
  Change note mod, 4.0.2.
 2002-03-29 09:02:14 -06:00
unknown
585a06ebf0 resolving ... 2002-03-29 14:17:42 +02:00
unknown
3c7b44842a manual.texi misc. small fixes 
Docs/manual.texi:
  misc. small fixes
 2002-03-28 21:18:28 -06:00
unknown
531c4b65fd manual.texi test 
Docs/manual.texi:
  test
 2002-03-28 20:49:05 +02:00
unknown
9ff9802f46 manual.texi sendmail test 
Docs/manual.texi:
  sendmail test
 2002-03-28 20:47:25 +02:00
unknown
d83c430779 manual.texi Fix a few glitches in my last commit. 
manual.texi	Make a few -ized -> -ised changes.


Docs/manual.texi:
  Fix a few glitches in my last commit.
  Make a few -ized -> -ised changes.
 2002-03-28 12:30:03 -06:00
unknown
f3e9f9191f manual.texi - Clean up some privilege name references. 
manual.texi	- Clean up DES function descriptions.
manual.texi	- Correct incorrect INET_NTOA() description.
manual.texi	- Break too-long lines in a few query examples.


Docs/manual.texi:
  - Clean up some privilege name references.
  - Clean up DES function descriptions.
  - Correct incorrect INET_NTOA() description.
  - Break too-long lines in a few query examples.
 2002-03-28 12:13:29 -06:00
unknown
fb3fcc8712 manual.texi 2002-03-28 19:31:59 +02:00
unknown
1364dccf7d manual.texi 2002-03-28 19:29:37 +02:00
unknown
2d075bd999 manual.texi Change note mods, 4.0.2. 
manual.texi	Fix a too-long-line in query example.


Docs/manual.texi:
  Change note mods, 4.0.2.
  Fix a too-long-line in query example.
 2002-03-28 11:18:36 -06:00
unknown
9056fd38ac manual.texi test 
Docs/manual.texi:
  test
 2002-03-28 19:08:55 +02:00
unknown
8fb580eaa0 manual.texi test 
Docs/manual.texi:
  test
 2002-03-28 19:07:34 +02:00
unknown
b344dbc2da Two bug fixes 
Docs/manual.texi:
  Added text fof bug fixes
readline/Makefile.am:
  Bug fix for coredump of mysql program with some Ctrl+keys
sql/convert.cc:
  A bug fix for using SET CHAR... SET on columns > 64K
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2002-03-28 18:35:21 +02:00
unknown
5bfcbd1fc5 manual.texi fixing my texi errors 
Docs/manual.texi:
  fixing my texi errors
 2002-03-28 18:34:52 +02:00
unknown
ad2dafbf36 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


Docs/manual.texi:
  Auto merged
 2002-03-28 15:40:30 +02:00
unknown
c1291234c3 Bug fixes 
Docs/manual.texi:
  I have to document my bug fixes ...
readline/Makefile.am:
  Fix for core dump in mysql monitor program when some Ctrl keys are
  pressed
sql/convert.cc:
  Fix of the bug with columns > 64 K when SET CHAR.. SET is used
 2002-03-28 15:37:06 +02:00
unknown
aea0dfd466 manual.texi capitalize des_encrypt()/des_descrypt() 
Docs/manual.texi:
  capitalize des_encrypt()/des_descrypt()
 2002-03-27 23:11:30 -06:00
unknown
2e9104e284 manual.texi sparc, Sparc, etc. -> SPARC 
manual.texi	OSF1 -> OSF/1
manual.texi	Let's get those trademarks right. :-)


Docs/manual.texi:
  sparc, Sparc, etc. -> SPARC
  OSF1 -> OSF/1
  Let's get those trademarks right. :-)
 2002-03-27 18:25:56 -06:00
unknown
695bda726d manual.texi minor fixups 
Docs/manual.texi:
  minor fixups
 2002-03-27 18:08:04 -06:00
unknown
079025381f checkin after merge 2002-03-27 17:58:28 -06:00
unknown
9ee129a33d manual.texi Change note mods, 3.23.39 to 4.0.2. 
manual.texi	fix typo


Docs/manual.texi:
  Change note mods, 3.23.39 to 4.0.2.
 2002-03-27 17:30:33 -06:00
unknown
6e4b6442b3 mirrors.texi: 
Update


Docs/mirrors.texi:
  Update
 2002-03-27 21:54:10 +02:00
unknown
e82a6417c4 merge (remove conflicting zip files) 
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-ChangeLog:
  Delete: zlib/ChangeLog
BitKeeper/deleted/.del-descrip.mms:
  Delete: zlib/descrip.mms
BitKeeper/deleted/.del-zlib.def:
  Delete: zlib/os2/zlib.def
BitKeeper/deleted/.del-example.c:
  Delete: zlib/example.c
BitKeeper/deleted/.del-faq:
  Delete: zlib/faq
BitKeeper/deleted/.del-gzio.c:
  Delete: zlib/gzio.c
BitKeeper/deleted/.del-index:
  Delete: zlib/index
BitKeeper/deleted/.del-infblock.c:
  Delete: zlib/infblock.c
BitKeeper/deleted/.del-infblock.h:
  Delete: zlib/infblock.h
BitKeeper/deleted/.del-infcodes.c:
  Delete: zlib/infcodes.c
BitKeeper/deleted/.del-infcodes.h:
  Delete: zlib/infcodes.h
BitKeeper/deleted/.del-inffast.c:
  Delete: zlib/inffast.c
BitKeeper/deleted/.del-Make_vms.com:
  Delete: zlib/Make_vms.com
BitKeeper/deleted/.del-inffast.h:
  Delete: zlib/inffast.h
BitKeeper/deleted/.del-inffixed.h:
  Delete: zlib/inffixed.h
BitKeeper/deleted/.del-inflate.c:
  Delete: zlib/inflate.c
BitKeeper/deleted/.del-inftrees.c:
  Delete: zlib/inftrees.c
BitKeeper/deleted/.del-inftrees.h:
  Delete: zlib/inftrees.h
BitKeeper/deleted/.del-infutil.c:
  Delete: zlib/infutil.c
BitKeeper/deleted/.del-infutil.h:
  Delete: zlib/infutil.h
BitKeeper/deleted/.del-maketree.c:
  Delete: zlib/maketree.c
BitKeeper/deleted/.del-minigzip.c:
  Delete: zlib/minigzip.c
BitKeeper/deleted/.del-readme:
  Delete: zlib/readme
BitKeeper/deleted/.del-Makefile.riscos:
  Delete: zlib/Makefile.riscos
BitKeeper/deleted/.del-trees.c:
  Delete: zlib/trees.c
BitKeeper/deleted/.del-trees.h:
  Delete: zlib/trees.h
BitKeeper/deleted/.del-uncompr.c:
  Delete: zlib/uncompr.c
BitKeeper/deleted/.del-zconf.h:
  Delete: zlib/zconf.h
BitKeeper/deleted/.del-zlib.3:
  Delete: zlib/zlib.3
BitKeeper/deleted/.del-zlib.dsp:
  Delete: zlib/zlib.dsp
BitKeeper/deleted/.del-zlib.h:
  Delete: zlib/zlib.h
BitKeeper/deleted/.del-zlib.html:
  Delete: zlib/zlib.html
BitKeeper/deleted/.del-zutil.c:
  Delete: zlib/zutil.c
BitKeeper/deleted/.del-zutil.h:
  Delete: zlib/zutil.h
BitKeeper/deleted/.del-adler32.c:
  Delete: zlib/adler32.c
BitKeeper/deleted/.del-Makefile.pup:
  Delete: zlib/amiga/Makefile.pup
BitKeeper/deleted/.del-Makefile.sas:
  Delete: zlib/amiga/Makefile.sas
BitKeeper/deleted/.del-README.contrib:
  Delete: zlib/contrib/README.contrib
BitKeeper/deleted/.del-visual-basic.txt:
  Delete: zlib/contrib/visual-basic.txt
BitKeeper/deleted/.del-gvmat32.asm:
  Delete: zlib/contrib/asm386/gvmat32.asm
BitKeeper/deleted/.del-gvmat32c.c:
  Delete: zlib/contrib/asm386/gvmat32c.c
BitKeeper/deleted/.del-mkgvmt32.bat:
  Delete: zlib/contrib/asm386/mkgvmt32.bat
BitKeeper/deleted/.del-zlibvc.def:
  Delete: zlib/contrib/asm386/zlibvc.def
BitKeeper/deleted/.del-zlibvc.dsp:
  Delete: zlib/contrib/asm386/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw:
  Delete: zlib/contrib/asm386/zlibvc.dsw
BitKeeper/deleted/.del-algorithm.txt:
  Delete: zlib/algorithm.txt
BitKeeper/deleted/.del-match.s:
  Delete: zlib/contrib/asm586/match.s
BitKeeper/deleted/.del-readme.586:
  Delete: zlib/contrib/asm586/readme.586
BitKeeper/deleted/.del-match.s~1:
  Delete: zlib/contrib/asm686/match.s
BitKeeper/deleted/.del-readme.686:
  Delete: zlib/contrib/asm686/readme.686
BitKeeper/deleted/.del-zlib.mak:
  Delete: zlib/contrib/delphi/zlib.mak
BitKeeper/deleted/.del-zlibdef.pas:
  Delete: zlib/contrib/delphi/zlibdef.pas
BitKeeper/deleted/.del-d_zlib.bpr:
  Delete: zlib/contrib/delphi2/d_zlib.bpr
BitKeeper/deleted/.del-d_zlib.cpp:
  Delete: zlib/contrib/delphi2/d_zlib.cpp
BitKeeper/deleted/.del-readme.txt:
  Delete: zlib/contrib/delphi2/readme.txt
BitKeeper/deleted/.del-zlib.bpg:
  Delete: zlib/contrib/delphi2/zlib.bpg
BitKeeper/deleted/.del-compress.c:
  Delete: zlib/compress.c
BitKeeper/deleted/.del-zlib.bpr:
  Delete: zlib/contrib/delphi2/zlib.bpr
BitKeeper/deleted/.del-zlib.cpp:
  Delete: zlib/contrib/delphi2/zlib.cpp
BitKeeper/deleted/.del-zlib.pas:
  Delete: zlib/contrib/delphi2/zlib.pas
BitKeeper/deleted/.del-zlib32.bpr:
  Delete: zlib/contrib/delphi2/zlib32.bpr
BitKeeper/deleted/.del-zlib32.cpp:
  Delete: zlib/contrib/delphi2/zlib32.cpp
BitKeeper/deleted/.del-test.cpp:
  Delete: zlib/contrib/iostream/test.cpp
BitKeeper/deleted/.del-zfstream.cpp:
  Delete: zlib/contrib/iostream/zfstream.cpp
BitKeeper/deleted/.del-zfstream.h:
  Delete: zlib/contrib/iostream/zfstream.h
BitKeeper/deleted/.del-zstream.h:
  Delete: zlib/contrib/iostream2/zstream.h
BitKeeper/deleted/.del-zstream_test.cpp:
  Delete: zlib/contrib/iostream2/zstream_test.cpp
BitKeeper/deleted/.del-crc32.c:
  Delete: zlib/crc32.c
BitKeeper/deleted/.del-ChangeLogUnzip:
  Delete: zlib/contrib/minizip/ChangeLogUnzip
BitKeeper/deleted/.del-miniunz.c:
  Delete: zlib/contrib/minizip/miniunz.c
BitKeeper/deleted/.del-minizip.c:
  Delete: zlib/contrib/minizip/minizip.c
BitKeeper/deleted/.del-readme.txt~1:
  Delete: zlib/contrib/minizip/readme.txt
BitKeeper/deleted/.del-unzip.c:
  Delete: zlib/contrib/minizip/unzip.c
BitKeeper/deleted/.del-unzip.def:
  Delete: zlib/contrib/minizip/unzip.def
BitKeeper/deleted/.del-unzip.h:
  Delete: zlib/contrib/minizip/unzip.h
BitKeeper/deleted/.del-zip.c:
  Delete: zlib/contrib/minizip/zip.c
BitKeeper/deleted/.del-zip.def:
  Delete: zlib/contrib/minizip/zip.def
BitKeeper/deleted/.del-zip.h:
  Delete: zlib/contrib/minizip/zip.h
BitKeeper/deleted/.del-deflate.c:
  Delete: zlib/deflate.c
BitKeeper/deleted/.del-zlibvc.def~1:
  Delete: zlib/contrib/minizip/zlibvc.def
BitKeeper/deleted/.del-zlibvc.dsp~1:
  Delete: zlib/contrib/minizip/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw~1:
  Delete: zlib/contrib/minizip/zlibvc.dsw
BitKeeper/deleted/.del-makefile.w32:
  Delete: zlib/contrib/untgz/makefile.w32
BitKeeper/deleted/.del-untgz.c:
  Delete: zlib/contrib/untgz/untgz.c
BitKeeper/deleted/.del-Makefile.b32:
  Delete: zlib/msdos/Makefile.b32
BitKeeper/deleted/.del-Makefile.bor:
  Delete: zlib/msdos/Makefile.bor
BitKeeper/deleted/.del-Makefile.dj2:
  Delete: zlib/msdos/Makefile.dj2
BitKeeper/deleted/.del-Makefile.emx:
  Delete: zlib/msdos/Makefile.emx
BitKeeper/deleted/.del-Makefile.msc:
  Delete: zlib/msdos/Makefile.msc
BitKeeper/deleted/.del-deflate.h:
  Delete: zlib/deflate.h
BitKeeper/deleted/.del-Makefile.tc:
  Delete: zlib/msdos/Makefile.tc
BitKeeper/deleted/.del-Makefile.w32:
  Delete: zlib/msdos/Makefile.w32
BitKeeper/deleted/.del-Makefile.wat:
  Delete: zlib/msdos/Makefile.wat
BitKeeper/deleted/.del-zlib.def~1:
  Delete: zlib/msdos/zlib.def
BitKeeper/deleted/.del-zlib.rc:
  Delete: zlib/msdos/zlib.rc
BitKeeper/deleted/.del-Makefile.emx~1:
  Delete: zlib/nt/Makefile.emx
BitKeeper/deleted/.del-Makefile.gcc:
  Delete: zlib/nt/Makefile.gcc
BitKeeper/deleted/.del-Makefile.nt:
  Delete: zlib/nt/Makefile.nt
BitKeeper/deleted/.del-zlib.dnt:
  Delete: zlib/nt/zlib.dnt
BitKeeper/deleted/.del-Makefile.os2:
  Delete: zlib/os2/Makefile.os2
configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
Docs/manual.texi:
  merge
sql/ha_innodb.cc:
  merge
 2002-03-27 06:44:23 +02:00
unknown
c445c6c428 manual.texi fix a few typos. 
Docs/manual.texi:
  fix a few typos.
 2002-03-26 22:22:38 -06:00
unknown
36b38aa503 merge with 3.23.50 
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
configure.in:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/fsp/fsp0fsp.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0rw.ic:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/range.test:
  Auto merged
scripts/mysqldumpslow.sh:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/share/Makefile.am:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
Docs/manual.texi:
  merge
client/mysql.cc:
  merge
client/mysqldump.c:
  merge
innobase/buf/buf0buf.c:
  merge
innobase/os/os0file.c:
  merge
innobase/row/row0mysql.c:
  merge
mysql-test/r/range.result:
  merge
sql/ha_innodb.cc:
  merge
sql/log_event.h:
  merge
sql/mysqld.cc:
  merge
sql/sql_base.cc:
  merge
sql/sql_load.cc:
  merge
 2002-03-27 01:56:10 +02:00
unknown
d2ef10f11b Added InnoDB changes to changelog. 2002-03-27 09:37:02 +10:00
unknown
2bddca6226 Added InnoDB changes to changelog. 2002-03-27 09:34:43 +10:00
unknown
d1e7a7731d Merge paul@work.mysql.com:/home/bk/mysql-4.0 
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
 2002-03-26 17:33:32 -06:00
unknown
6229932f10 support for unsigned FLOAT/DOUBLE 
Docs/manual.texi:
  Updated STRCMP and UNION information
configure.in:
  Portability fix
include/config-win.h:
  Fix for WIN64
include/mysql_com.h:
  Cleanup
libmysql/libmysql.c:
  Cleanup
myisam/ft_boolean_search.c:
  Cleanup
mysys/array.c:
  Cleanup
mysys/thr_alarm.c:
  Cleanup
sql/ha_innodb.cc:
  Cleanup
 2002-03-27 00:50:54 +02:00
unknown
cd9643f3c1 Re-fixup of line length in InnoDB examples. Should be <76. 2002-03-27 08:37:02 +10:00
unknown
10ddd15326 Fixup of 3.23.50 Windows named pipe changes in manual. 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2002-03-27 07:50:14 +10:00
unknown
65679bc69f Merge paul@work.mysql.com:/home/bk/mysql-4.0 
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
 2002-03-26 13:51:09 -06:00
unknown
c0b9afcbd3 manual.texi: 
Cleanup


Docs/manual.texi:
  Cleanup
 2002-03-26 20:39:39 +02:00
unknown
d92ce47a8b manual.texi: 
Cleanup


Docs/manual.texi:
  Cleanup
 2002-03-26 20:33:55 +02:00
unknown
440b48153e Merge paul@work.mysql.com:/home/bk/mysql-4.0 
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
 2002-03-26 09:59:03 -06:00
unknown
bbedc5ebbf Fixed overflow bug 
Docs/manual.texi:
  Changelog
include/mysql_com.h:
  cleanup
sql/mysqld.cc:
  Fixed overflow bug in startup parameters to MySQL
 2002-03-26 13:24:50 +02:00
unknown
0077d501cf Fixups for REPAIR ... USE_FRM additions to manual. 2002-03-26 11:49:05 +10:00
unknown
b5361ffab2 manual.texi fix typo 
Docs/manual.texi:
  fix typo
 2002-03-25 18:30:43 -06:00
unknown
93650129ec manual.texi NUMERIC(M,D) arguments are optional. 
manual.texi	DEC is also a synonym for DECIMAL.


Docs/manual.texi:
  NUMERIC(M,D) arguments are optional.
  DEC is also a synonym for DECIMAL.
 2002-03-25 18:19:37 -06:00
unknown
2578d6d391 manual.texi Use "e-mail" consistently, not "email" sometimes 
manual.texi	and "e-mail" other times.


Docs/manual.texi:
  Use "e-mail" consistently, not "email" sometimes
  and "e-mail" other times.
 2002-03-25 17:55:27 -06:00