Commits · 15bde938b13ff733b3d01da508a69d3d99294334 · nexedi / MariaDB

15 Sep, 2003 2 commits

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 15bde938
unknown authored Sep 15, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
```
15bde938

New syntax: · bf6480ba

unknown authored Sep 15, 2003

CREATE TABLE t1(a NVARCHAR(10))
This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.

Note, standard SQL doesn't have "NVARCHAR" syntax.
There are only these syntaxes in SQL2003:
 NATIONAL VARCHAR
 NCHAR VARCHAR
 NATIONAL CHARACTER VARYING 
 NCHAR VARYING

- Tests were added for all the above syntaxes.


sql/lex.h:
  New syntax:
  
  CREATE TABLE t1(a NVARCHAR(10))
  This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.
  
  Note, standard SQL doesn't have "NVARCHAR" syntax.
  There are only these syntaxes in SQL2003:
   NATIONAL VARCHAR
   NCHAR VARCHAR
   NATIONAL CHARACTER VARYING 
   NCHAR VARYING
sql/sql_yacc.yy:
  New syntax:
  
  CREATE TABLE t1(a NVARCHAR(10))
  This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.
  
  Note, standard SQL doesn't have "NVARCHAR" syntax.
  There are only these syntaxes in SQL2003:
   NATIONAL VARCHAR
   NCHAR VARCHAR
   NATIONAL CHARACTER VARYING 
   NCHAR VARYING

bf6480ba

14 Sep, 2003 3 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5d1b299f
unknown authored Sep 14, 2003
```
into mysql.com:/home/dlenev/src/mysql-4.1-868
```
5d1b299f

Post merge fixes. Fixed tests after adding UNTIL conditions · b15eba88

unknown authored Sep 14, 2003

to SHOW SLAVE STATUS.


mysql-test/r/rpl000015.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_empty_master_crash.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_error_ignored_table.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_flush_log_loop.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_log.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_log_pos.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_max_relay_size.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_openssl.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_redirect.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_replicate_do.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_reset_slave.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_until.result:
  Post merge fix
mysql-test/t/rpl_until.test:
  Post merge fix

b15eba88

renamed join_types (as was suggested by Peter Gulutzan) · e3b11b1d
unknown authored Sep 14, 2003

e3b11b1d

13 Sep, 2003 7 commits

Manual merge after commiting START SLAVE UNTIL · 1f82a0de

unknown authored Sep 14, 2003


sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
include/mysqld_error.h:
  Manual merge
mysql-test/r/rpl000015.result:
  Manual merge
mysql-test/r/rpl_empty_master_crash.result:
  Manual merge
mysql-test/r/rpl_flush_log_loop.result:
  Manual merge
mysql-test/r/rpl_log.result:
  Manual merge
mysql-test/r/rpl_log_pos.result:
  Manual merge
mysql-test/r/rpl_redirect.result:
  Manual merge
mysql-test/r/rpl_replicate_do.result:
  Manual merge
mysql-test/r/rpl_rotate_logs.result:
  Manual merge
sql/share/czech/errmsg.txt:
  Manual merge
sql/share/danish/errmsg.txt:
  Manual merge
sql/share/dutch/errmsg.txt:
  Manual merge
sql/share/english/errmsg.txt:
  Manual merge
sql/share/estonian/errmsg.txt:
  Manual merge
sql/share/french/errmsg.txt:
  Manual merge
sql/share/german/errmsg.txt:
  Manual merge
sql/share/greek/errmsg.txt:
  Manual merge
sql/share/hungarian/errmsg.txt:
  Manual merge
sql/share/italian/errmsg.txt:
  Manual merge
sql/share/japanese/errmsg.txt:
  Manual merge
sql/share/korean/errmsg.txt:
  Manual merge
sql/share/norwegian-ny/errmsg.txt:
  Manual merge
sql/share/norwegian/errmsg.txt:
  Manual merge
sql/share/polish/errmsg.txt:
  Manual merge
sql/share/portuguese/errmsg.txt:
  Manual merge
sql/share/romanian/errmsg.txt:
  Manual merge
sql/share/russian/errmsg.txt:
  Manual merge
sql/share/serbian/errmsg.txt:
  Manual merge
sql/share/slovak/errmsg.txt:
  Manual merge
sql/share/spanish/errmsg.txt:
  Manual merge
sql/share/swedish/errmsg.txt:
  Manual merge
sql/share/ukrainian/errmsg.txt:
  Manual merge
sql/slave.cc:
  Manual merge
sql/slave.h:
  Manual merge
sql/sql_repl.cc:
  Manual merge
sql/sql_yacc.yy:
  Manual merge

1f82a0de

Implemented support for START SLAVE UNTIL (WL#868) · 2f8f0a7e

unknown authored Sep 14, 2003


include/mysqld_error.h:
  Added error codes for warnings and error messages for START SLAVE UNTIL
mysql-test/r/rpl000015.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_empty_master_crash.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_flush_log_loop.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_log.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_log_pos.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_redirect.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_replicate_do.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_rotate_logs.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
sql/lex.h:
  Added UNTIL symbol
sql/log.cc:
  Invalidating until_log_name comparison result if group_relay_log_name is changed
sql/log_event.cc:
  Invalidating until_log_name comparison result if group_master_log_name is changed
sql/repl_failsafe.cc:
  Cancel until condition if LOAD MASTER DATA is executed
sql/share/czech/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/danish/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/dutch/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/english/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/estonian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/french/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/german/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/greek/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/hungarian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/italian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/japanese/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/korean/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/norwegian-ny/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/norwegian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/polish/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/portuguese/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/romanian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/russian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/serbian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/slovak/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/spanish/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/swedish/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/ukrainian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/slave.cc:
  Fixed wrong locking order in init_relay_log_pos()
  Added until condition fields to SHOW SLAVE STATUS
  Added checking if UNTIL condition is reached 
  (added proper method, added its invocation, reorganized locking 
  in exec_relay_log_event() and next_event())
sql/slave.h:
  Members in RELAY_LOG_INFO for storing UNTIL condition. Also 
  methods for for invalidation of cached UNTIL condition comparison
  results
sql/sql_repl.cc:
  Now honoring UNTIL clause then starting slave thread. Proper 
  errors and warnings.
sql/sql_yacc.yy:
  Added support for UNTIL clause in START SLAVE. This involved 
  extraction of some of master_defs to separate master_file_def
  non-terminal.

2f8f0a7e

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · df8b036d
unknown authored Sep 13, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
df8b036d

Fixes for OPTION_FOUND_ROWS in UNION's · aedc0ab0

unknown authored Sep 13, 2003


mysql-test/r/subselect.result:
  A warning added to subselect test due to the recent changes.
  
  UNION in sub-select returns the empty set, which is why this warning is
  a mistery to me.
mysql-test/r/union.result:
  two changes.
  
  First one is due to the proper handling of LIMIT offset, limit in 
  UNION without all.
  
  Second is a change in behaviour due to the fact that ORDER by in a 
  UNION without braces is not now applicable to the last SELECT node.
  
  It can not be applied until one bug is fixed (after my vacation).
  
  Should be documented.

aedc0ab0

"normal" warning in test suite disabled · 7eb9d41c

unknown authored Sep 13, 2003

bad merge fixed


mysql-test/t/isam.test:
  bad merge fixed
mysql-test/t/lock_tables_lost_commit.test:
  "normal" warning in test suite disabled
mysql-test/t/subselect.test:
  "normal" warning in test suite disabled

7eb9d41c

error messages from english/errmsg.txt added to other languages. · 80206632

unknown authored Sep 13, 2003

bug#1269


sql/share/czech/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/danish/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/dutch/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/estonian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/french/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/german/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/greek/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/hungarian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/italian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/japanese/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/korean/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/norwegian-ny/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/norwegian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/polish/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/portuguese/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/romanian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/russian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/serbian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/slovak/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/spanish/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/swedish/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/ukrainian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269

80206632

removed double procedure deletetion · 434faadc
unknown authored Sep 13, 2003

434faadc

12 Sep, 2003 6 commits

fixed memory leak (now JOIN cleaning procedure always called) · 5b0c15a4
unknown authored Sep 13, 2003
```
sql/sql_select.cc:
  always clean JOIN
```
5b0c15a4
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 61663eaa
unknown authored Sep 12, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
```
61663eaa

Fix for a bug #1231 · 67dafb01

unknown authored Sep 12, 2003

Parse error caused global ORDER BY to be initialized although it should
not have been.

67dafb01

Monty's merge bug fixed · 11930efb

unknown authored Sep 12, 2003


libmysqld/lib_sql.cc:
  these definitions moved to be after my_bool declaration

11930efb

Fix results for mix_innodb_myisam_binlog · 32a4e783

unknown authored Sep 12, 2003

Optimize calls to current_thd


mysql-test/r/mix_innodb_myisam_binlog.result:
  updated results
mysql-test/t/mix_innodb_myisam_binlog.test:
  Fix for 4.1
sql/ha_innodb.cc:
  Don't call current_thd in an assert that is not deleted in release version
  (Because current_thd is slow)

32a4e783

Optimize thai character handling · 3500763b

unknown authored Sep 12, 2003

Remove sel000xxxx tests
After merge fixes


BitKeeper/deleted/.del-sel000033.test~3971fbe746eec069:
  Delete: mysql-test/t/sel000033.test
BitKeeper/deleted/.del-sel000033.result~56d1d02d72b94602:
  Delete: mysql-test/r/sel000033.result
BitKeeper/deleted/.del-sel000100.result~84ed46856cb3a69f:
  Delete: mysql-test/r/sel000100.result
BitKeeper/deleted/.del-sel000100.test~548501cad19a1a59:
  Delete: mysql-test/t/sel000100.test
mysql-test/r/distinct.result:
  Merge test with sel000100
mysql-test/r/grant.result:
  Update result after merge
mysql-test/r/range.result:
  After merge fix
  Merge test with sel000033
mysql-test/t/distinct.test:
  Merge test with sel000100
mysql-test/t/range.test:
  Merge test with sel000033
sql/log_event.cc:
  Remove duplicate allocation
sql/sql_select.cc:
  After merge fixes
strings/ctype-tis620.c:
  Remove usage of strnlen
  Optimize code and make it \0 safe

3500763b

11 Sep, 2003 7 commits

merge with 4.1 tree · 41824a35

unknown authored Sep 11, 2003


client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/client_test.c:
  Auto merged

41824a35

merge with 4.0.15 · d32bdcb1

unknown authored Sep 11, 2003


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Delete: scripts/mysql_fix_privilege_tables.sql
include/mysql.h:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_update.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

d32bdcb1

After merge fixes. · dd0d199e

unknown authored Sep 11, 2003

Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)


client/mysql.cc:
  After merge fix
include/mysql.h:
  Some additions to MYSQL_BIND for cleaner prepared statement code
libmysql/libmysql.c:
  mysql_prepare_result -> mysql_get_metadata()
  Added test for offset overflow when using mysql_fetch_column()
  Cleaned up mysql_fetch_column()
  Optimized fetch_result() usage
mysql-test/r/func_group.result:
  Updated results after merge
mysql-test/r/func_test.result:
  Updated results after merge
mysql-test/r/grant.result:
  Updated results after merge
mysql-test/r/loaddata.result:
  Updated results after merge
mysql-test/r/lowercase_table.result:
  Updated results after merge
mysql-test/r/mix_innodb_myisam_binlog.result:
  Updated results after merge (note that this is still not correct; Need patch to mysqld to fix this properly)
mysql-test/r/myisam.result:
  Updated results after merge
mysql-test/r/range.result:
  Updated results after merge
mysql-test/r/rpl_loaddata.result:
  Updated results after merge
mysql-test/r/rpl_loaddata_rule_m.result:
  Updated results after merge
mysql-test/r/rpl_loaddata_rule_s.result:
  Updated results after merge
mysql-test/r/rpl_log.result:
  Updated results after merge
mysql-test/r/union.result:
  Updated results after merge
mysql-test/t/lowercase_table.test:
  Update after merge
mysql-test/t/myisam.test:
  Update after merge
mysql-test/t/union.test:
  Update after merge
sql-bench/compare-results.sh:
  Fix for now output format
sql/field.h:
  Added is_null_in_record() to make ha_innodb.cc code more general
sql/ha_innodb.cc:
  Removed some functions that uses inernal (private) MySQL information
sql/item_cmpfunc.cc:
  After merge fix
sql/log_event.cc:
  After merge fix; (Some code should be checked by Guilhem)
sql/opt_range.cc:
  Simple optimzation and after merge fixes
sql/slave.cc:
  After merge fix
sql/sql_acl.cc:
  After merge fix + code cleanup
sql/sql_select.cc:
  After merge fix
sql/sql_show.cc:
  After merge fix
sql/sql_table.cc:
  After merge fix
  Cleanup of mysql_checksum_table()
sql/sql_union.cc:
  After merge fixes.
  Note that after this the union test still fails; Will be fixed shortly...
tests/client_test.c:
  mysql_prepare_result() -> mysql_get_metadata()

dd0d199e

Fix for the bug #1200: Can't start MySQL if bind-address set to hostname that starts with a number. · 07bc35e1
unknown authored Sep 11, 2003

07bc35e1

SCRUM · d6f15e9d

unknown authored Sep 11, 2003

embedded&client library
some fixes: zero at the end of the data added
mysql_list_fields became 'virtual'


include/mysql.h:
  mysql_list_fields became 'virtual'
libmysql/client_settings.h:
  in client library we need proper implementation for list_fields
libmysql/libmysql.c:
  implementation for remote server
libmysqld/lib_sql.cc:
  we still need zero at the end of the data in client (see mysql.cc).
  I feel it should be changed
libmysqld/libmysqld.c:
  implementation for embedded server
sql-common/client.c:
  cli_list_fields member set for client library
sql/client_settings.h:
  we don't need mysql_list_fields in mini_client code

d6f15e9d

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 3f6d78f6
unknown authored Sep 11, 2003
```
into mashka.mysql.fi:/home/my/mysql-4.0
```
3f6d78f6
Remove not used define (my_strxfrm) · 876b47ee
unknown authored Sep 11, 2003
```
include/m_ctype.h:
  Remove not used define
```
876b47ee

10 Sep, 2003 12 commits

- Added option "--skip-name-resolve" to mysql_install_db to be able to · 4d2d0eb5

unknown authored Sep 10, 2003

   use the local machine's IP address instead of the host name when 
   building the initial grant tables if "skip-name-resolve" has been
   specified in my.cnf. This can be helpful on FreeBSD to avoid
   thread-safety problems with the FreeBSD resolver libraries.
   (Thanks to Jeremy Zawodny for the patch)


scripts/mysql_install_db.sh:
   - Added option "--skip-name-resolve" to use the local machine's IP address
     instead of the host name when building the initial grant tables if
     "skip-name-resolve" has been specified in my.cnf (Thanks to Jeremy 
     Zawodny for the patch)

4d2d0eb5

- Updated version number to 4.0.16 now that 4.0.15 has been released · 6d371797
unknown authored Sep 10, 2003
```
 - tagged ChangeSet 1.1556 as mysql-4.0.15


configure.in:
   - Bumped up version number: 4.0.15 -> 4.0.16
```
6d371797
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 565d9221
unknown authored Sep 10, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
565d9221
mysql_create_table now accepts field lengths in CREATE form, not in internal form. · fef3c15a
unknown authored Sep 10, 2003
```
This is to simplify fixing indexes to mean number of chars rather than bytes too.
```
fef3c15a
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · c33a4508
unknown authored Sep 10, 2003
```
into deer.(none):/home/hf/work/mysql-4.1.2way
```
c33a4508

SCRUM: embedde library · 01397f5d

unknown authored Sep 10, 2003

Minor fixes


libmysqld/lib_sql.cc:
  Comment added
libmysqld/libmysqld.c:
  this part of code should be moved under if (mysql)

01397f5d

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8f2c2757
unknown authored Sep 10, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
```
8f2c2757
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · af1c7280
unknown authored Sep 10, 2003
```
into deer.(none):/home/hf/work/mysql-4.1.2way
```
af1c7280

SCRUM: embedded library · 12e063b5

unknown authored Sep 10, 2003

mysql_fetch_length fixed for embedded library. Now data length is stored
before the data. Pointers in row still points to the data so you have to
get *(uint*)(data_ptr - sizeof(uint)) to get data length


libmysqld/lib_sql.cc:
  bug fixed - user didn't get error description
  Protocol::net_store_data changed to store data length before the data
libmysqld/libmysqld.c:
  emb_fetch_length changed to retrive data length stored before the data

12e063b5

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 42eb4349

unknown authored Sep 10, 2003

into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged

42eb4349

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c734cca6
unknown authored Sep 10, 2003
```
into mysql.r18.ru:/usr/home/ram/work/4.1
```
c734cca6
Fix for the fix for the bug #1209: SELECT DATABASE(). · b7f06b94
unknown authored Sep 10, 2003

b7f06b94

09 Sep, 2003 3 commits

after merge fix · 479c3766
unknown authored Sep 09, 2003

479c3766

merge · 62a33db0

unknown authored Sep 09, 2003


mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged

62a33db0

Cleaned up last bug fixes · 8272be94

unknown authored Sep 09, 2003

Fix bug in SHOW GRANTS when there is a column privilege but no table privilege


include/mysql.h:
  Make server_inited external
libmysqld/libmysqld.c:
  Remove reference to (wrong) external variable
mysql-test/r/grant.result:
  Fixed up grant test to not user 'user1' or 'user2'
  Check for bug in SHOW GRANTS when there is a column privilege but no table privilege
mysql-test/r/mix_innodb_myisam_binlog.result:
  Change to use tables t1 and t2
mysql-test/t/grant.test:
  Fixed up grant test to not user 'user1' or 'user2'
  Check for bug in SHOW GRANTS when there is a column privilege but no table privilege
mysql-test/t/mix_innodb_myisam_binlog.test:
  Change to use tables t1 and t2
sql/sql_acl.cc:
  Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
sql/sql_parse.cc:
  Use HAVE_REPLICATION instead of EMBEDDED_LIBRARY

8272be94