diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-09-09 16:52:22 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-09-09 16:52:22 +0300 |
| commit | ed2c4854dd9d6b75f052d0f7e824b68cc68e35d0 (patch) | |
| tree | 7615ce281add0dfaa6366a6776a26995613845cb /ndb/include/kernel/Interpreter.hpp | |
| parent | 7de077f7dfc209bdfcc847920a394ff4c55a2e96 (diff) | |
| parent | bc787254247cb66a5e1adc0af6834c10737ecc6e (diff) | |
| download | mariadb-git-ed2c4854dd9d6b75f052d0f7e824b68cc68e35d0.tar.gz | |
merge
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'ndb/include/kernel/Interpreter.hpp')
| -rw-r--r-- | ndb/include/kernel/Interpreter.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ndb/include/kernel/Interpreter.hpp b/ndb/include/kernel/Interpreter.hpp index 2c282be361c..74399f5732e 100644 --- a/ndb/include/kernel/Interpreter.hpp +++ b/ndb/include/kernel/Interpreter.hpp @@ -83,7 +83,7 @@ public: static Uint32 LoadConst64(Uint32 Register); // Value in next 2 words static Uint32 Add(Uint32 DstReg, Uint32 SrcReg1, Uint32 SrcReg2); static Uint32 Sub(Uint32 DstReg, Uint32 SrcReg1, Uint32 SrcReg2); - static Uint32 Branch(Uint32 Inst, Uint32 R1, Uint32 R2); + static Uint32 Branch(Uint32 Inst, Uint32 Reg1, Uint32 Reg2); static Uint32 ExitOK(); /** @@ -184,8 +184,8 @@ Interpreter::Sub(Uint32 Dcoleg, Uint32 SrcReg1, Uint32 SrcReg2){ inline Uint32 -Interpreter::Branch(Uint32 Inst, Uint32 R1, Uint32 R2){ - return (R1 << 9) + (R2 << 6) + Inst; +Interpreter::Branch(Uint32 Inst, Uint32 Reg1, Uint32 Reg2){ + return (Reg1 << 9) + (Reg2 << 6) + Inst; } inline |